94 Commits

Author	SHA1	Message	Date
Julien Duponchelle	699ecb7c89	Merge branch 'master' into 2.1	2017-07-11 18:59:50 +02:00
ziajka	8e8b8bc5a5	WebSocket binary mode support for docker	2017-07-06 10:13:00 +02:00
ziajka	c6f9ec3758	More information on Docker WebSocket error	2017-07-05 10:36:58 +02:00
Julien Duponchelle	93adef91d8	Merge branch '2.0' into 2.1	2017-05-31 16:58:31 +02:00
Julien Duponchelle	5bb6c51698	Fix an error when logging Docker container fail to start	2017-05-23 13:31:04 +02:00
Bernhard Ehlers	2191c487b6	Support images created by "docker commit". Fixes #1039	2017-05-23 10:23:11 +02:00
Julien Duponchelle	a4245fcf44	Aiohttp 2.0 ... Ref #1000	2017-05-17 18:42:17 +02:00
Bernhard Ehlers	ecba758c58	Docker aux console is a VT100 terminal ... Without that program like nano can't work. Signed-off-by: Julien Duponchelle <julien@gns3.net>	2017-05-03 10:30:43 +02:00
Julien Duponchelle	fdd1084714	Fix bridge 'bridge0' already exist when we have trouble with a container ... Fix #973	2017-04-10 16:58:00 +02:00
Julien Duponchelle	132bc87081	Dissallow parallel pull of docker images ... Fix #962	2017-03-27 20:46:25 +02:00
Julien Duponchelle	08bafc2dcc	Catch a timeout error in docker ... Fix #936	2017-03-16 10:39:08 +01:00
Julien Duponchelle	52adf45740	Fix an error when docker hub failed to anwser ... Fix #843	2016-12-20 09:15:28 +01:00
Julien Duponchelle	8f6d25cc2b	Fix start all create error if a docker container is already running ... Fix #839	2016-12-16 16:19:23 +01:00
Julien Duponchelle	46b6e7c5ee	Fix hot link issues in Docker ... Fix #817	2016-12-14 16:53:20 +01:00
Julien Duponchelle	d0f65aebff	Fix Can't delete link between docker VM after they were in use ... Fix #818	2016-12-14 12:01:34 +01:00
Bernhard Ehlers	a3495304ad	Code cleanup for docker interface creation ... Fix #819 Signed-off-by: Julien Duponchelle <julien@gns3.net>	2016-12-13 16:07:59 +01:00
Julien Duponchelle	c4327ec74c	Improve docker HTTP console ... Fix #816	2016-12-09 16:41:15 +01:00
Julien Duponchelle	ac1eef256f	Use tap adapter instead of veth for docker (allow usage of vlan) ... Ref #716	2016-10-24 12:35:50 +02:00
Julien Duponchelle	ec3660c979	Catch an error when docker is not running	2016-10-14 19:06:12 +02:00
Julien Duponchelle	fbdcf67d29	If docker container state failed to return we consider the container stopped	2016-10-14 19:00:25 +02:00
Julien Duponchelle	5a7f5d2950	Check if GNS3 has access to all docker resssources ... Ref #702	2016-10-04 21:14:19 +02:00
Julien Duponchelle	67fc563d81	Merge branch 'master' into 2.0	2016-09-07 15:01:51 +02:00
Julien Duponchelle	ca4d09ea40	Merge branch 'master' into 2.0	2016-07-05 15:41:53 +02:00
Julien Duponchelle	c0b09ae76a	Merge branch '1.5' into 2.0	2016-06-27 14:24:48 +02:00
grossmj	d28fad223f	Allows hot-linking for Docker containers. Ref #267.	2016-06-24 17:26:40 -06:00
grossmj	04022677bd	Use uBridge for Qemu connections. Ref #267. ... Handle packet captures for VPCS & Qemu nodes. Fixes #548.	2016-06-23 16:56:06 -06:00
grossmj	00da15e4af	Use uBridge for VPCS connections. Ref #267.	2016-06-22 19:40:46 -06:00
Julien Duponchelle	2a1c5cfd9c	Merge branch '1.5' into 2.0	2016-06-15 19:14:03 +02:00
Julien Duponchelle	52f852bc6d	Merge branch '1.5' into 2.0	2016-06-14 09:50:07 +02:00
Julien Duponchelle	61ac8763f2	Merge branch '1.5' into 2.0	2016-06-06 14:28:21 +02:00
Julien Duponchelle	cb7dbfb256	Merge branch '1.5' into 2.0	2016-06-02 13:47:40 +02:00
grossmj	f0e0988d6a	Includes uBridge stdout in case of error.	2016-05-30 22:07:37 -06:00
Julien Duponchelle	da6cb13338	Merge branch '1.5' into 2.0	2016-05-24 10:13:53 +02:00
Julien Duponchelle	00f80f54e8	Merge branch '1.5' into 2.0	2016-05-19 13:32:30 +02:00
Julien Duponchelle	d5895c3a47	Merge branch '1.5' into 2.0	2016-05-18 11:25:41 +02:00
Julien Duponchelle	f052299eb1	Return status in all cases	2016-05-17 19:51:06 +02:00
Julien Duponchelle	1eb77a0b3f	Fix docker support on 2.0 ... Fix #528	2016-05-16 18:32:29 +02:00
grossmj	5b604da33a	Make sure nodes send the right notification when started, stopped or suspended.	2016-05-13 20:41:58 -06:00
grossmj	51738e19c3	Some spring cleanup for Docker VM.	2016-05-13 19:28:53 -06:00
Julien Duponchelle	5280644327	Return command_line and node_directory via the controller	2016-05-12 10:39:50 +02:00
grossmj	5a76f81271	Refactoring to use a common node class for all VMs and other (future) objects.	2016-05-11 11:35:36 -06:00
Julien Duponchelle	9dca7dfe4a	Merge branch '1.5' into 2.0	2016-05-10 17:51:40 +02:00
Julien Duponchelle	8777e027b0	Merge branch '1.5' into 2.0	2016-04-26 11:48:43 +02:00
Julien Duponchelle	58d4a529d4	Rename hypervisor to compute ... Fix #487	2016-04-15 17:59:59 +02:00