Commit Graph

1744 Commits

Author SHA1 Message Date
Julien Duponchelle
268c61ce80
Merge branch 'docker-init' of https://github.com/ehlers/gns3-server into ehlers-docker-init 2016-03-24 16:11:20 +01:00
Julien Duponchelle
d2c32bb570
Merge branch 'master' into 1.5 2016-03-24 09:17:52 +01:00
Julien Duponchelle
3fe8016938
1.4.6 dev1 2016-03-23 18:14:04 +01:00
Julien Duponchelle
01dbaea2e4
1.4.5 2016-03-23 18:11:48 +01:00
grossmj
427cb05c2a Stop the VMware VM if there is an error while setting up the network connections or console. 2016-03-23 10:54:45 -06:00
Bernhard Ehlers
d36a9f3403 docker-init: add DHCP support 2016-03-23 09:13:07 +00:00
Jeremy Grossmann
39c41336db Merge pull request #459 from GNS3/remote_install
Remote install on 14.04 ubuntu
2016-03-22 15:08:15 -06:00
grossmj
fa22e19321 Bump version to 1.4.5dev2 2016-03-22 14:43:47 -06:00
Bernhard Ehlers
d472f47829 docker-init: static busybox, support for /etc/network/interfaces 2016-03-22 15:28:56 +00:00
Julien Duponchelle
dcc4ddf11b
Add a test for \r\n
Fix #458
2016-03-21 16:54:03 +01:00
Julien Duponchelle
e35ab1e8c0
Remote install on 14.04 ubuntu 2016-03-21 14:52:42 +01:00
grossmj
975e1c8fa7 Fixes dev syntax bug. 2016-03-20 11:32:40 -06:00
grossmj
19b46a4014 Include VMware VMs paths found preferences.ini 2016-03-19 15:41:26 -06:00
grossmj
7cdf23f497 Allow to stop a VMware VM from GNS3 even if halted within the VM. Fixes #1118. 2016-03-19 12:08:44 -06:00
grossmj
06da40cdcd Keep Dynamips stdout log file in the project directory. 2016-03-19 11:32:15 -06:00
Julien Duponchelle
174e7cccea
Merge branch 'master' into 1.5 2016-03-16 16:35:03 +01:00
Julien Duponchelle
75212cda3f
Improve tests on Travis 2016-03-16 16:34:36 +01:00
grossmj
a018c5b0f5 Get MAC addresses for host interfaces to use for filtering frames from vmnet interfaces. 2016-03-14 18:27:51 -06:00
grossmj
93e2d4096d Dynamips uuid hypervisor command is no longer supported. 2016-03-12 22:15:36 -07:00
grossmj
c077f3b990 Restart NPF service after adding vmnet adapters on Windows. 2016-03-12 11:04:50 -07:00
Julien Duponchelle
60e9241857
Merge branch 'ehlers-docker-init' into 1.5 2016-03-04 09:09:09 +01:00
Julien Duponchelle
ee4b094160
Fix tests on @ehlers Docker init patch 2016-03-04 09:08:40 +01:00
Bernhard Ehlers
1dd437ecdc updated docker command line processing 2016-03-03 09:12:36 +01:00
Julien Duponchelle
84eb8356e8
Create a container class and a flag for enable it from command line
Ref #417
2016-03-02 09:49:52 +01:00
Julien Duponchelle
c833a20a8c
Fix Deleting a docker VM gives console error message "Not connected"
Fix #446
2016-03-01 20:25:50 +01:00
Julien Duponchelle
eae6f33e29
Inject an init script
It's very basic for the moment

Ref #1089
2016-03-01 18:38:03 +01:00
Julien Duponchelle
59c1e125d3
Change the name of veth to avoid bugs :(
Fun stuff the name create different behavior with
network manager.

Ref #440
2016-03-01 15:33:30 +01:00
Julien Duponchelle
7469f65fa0
Add setter for allocate_aux 2016-03-01 15:33:07 +01:00
Julien Duponchelle
392fa187c2
Expose the allocate_aux setting 2016-03-01 15:01:45 +01:00
Julien Duponchelle
dab1b26569
Aux console for Docker
Fix https://github.com/GNS3/gns3-gui/issues/1039
2016-03-01 14:53:43 +01:00
Julien Duponchelle
03ffce0a75
Docker VNC support
Ref https://github.com/GNS3/gns3-gui/issues/947
2016-02-29 23:09:47 +01:00
Julien Duponchelle
9d28f4c0c3
Refactor aux port allocation
This move the allocation of aux port to the base vm.
Also now the free of console port during the close is in the
base VM.

An aux port is allocated to the docker container but not used
for the moment.

Ref https://github.com/GNS3/gns3-gui/issues/1039
2016-02-29 10:44:08 +01:00
Julien Duponchelle
04b02171bb
Support /etc/gns3/gns3_server.conf for the config
It's better for a server deployment
2016-02-25 15:07:55 +01:00
Julien Duponchelle
e91e3525c4
Improve warning if fusion is not installed or in non standard location
For the moment I don't see a good reason to not installating fusion
in the standard location.  If check in Docker Machine code they don't
support it. And with their large user base we can think it's safe.

Fix #435
2016-02-25 12:15:38 +01:00
Julien Duponchelle
c333e9451f
Fix pull of images
Fix #445
2016-02-24 17:08:28 +01:00
Julien Duponchelle
49f1931e95
Merge branch 'master' into 1.5 2016-02-24 15:52:27 +01:00
Julien Duponchelle
ebb8c0d0b0
Increase test timeout to avoid random problems on travis 2016-02-24 15:51:51 +01:00
Julien Duponchelle
2d42f32d71
Restart the container if running and you change the hostname
Fix #439
2016-02-24 15:47:53 +01:00
Julien Duponchelle
fd18458588
Fix stop capture for Docker
Fix #443, #442
2016-02-24 15:14:01 +01:00
Julien Duponchelle
5f15667ad1
Rename invalid variable iou_manager in Docker 2016-02-24 15:08:48 +01:00
Julien Duponchelle
bbdbc971c0
Fix Exception on removal of Docker VM
Fix #441
2016-02-24 15:04:45 +01:00
Julien Duponchelle
057b637961
Set the hostname for docker containers
Fix #437
2016-02-23 19:22:35 +01:00
Julien Duponchelle
87eef545e1
Correctly close the telnet connection for docker
Fix #427
2016-02-23 16:54:12 +01:00
Julien Duponchelle
38815b3eaf
Merge branch 'master' into 1.5 2016-02-23 15:42:58 +01:00
Julien Duponchelle
4c4613b29b
1.4.5dev1 2016-02-23 15:41:45 +01:00
Julien Duponchelle
9d8cb4521d
1.4.4 2016-02-23 14:38:26 +01:00
Julien Duponchelle
9dd09ccde1
1.4.4dev4 2016-02-22 13:06:56 +01:00
Julien Duponchelle
86ebb9b840
1.4.4dev3 2016-02-22 11:20:10 +01:00
grossmj
569da0ce3a Bump version to 1.4.4dev2 2016-02-20 18:41:38 -07:00
grossmj
f73b288a28 Check if VMware Fusion is correctly installed when retrieving the VM list. 2016-02-20 10:59:06 -07:00