1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 00:38:10 +00:00
Commit Graph

72 Commits

Author SHA1 Message Date
Julien Duponchelle
b33ba5f8ea
Don't allow user to overwrite GNS3 docker environment variables
Fix #1098
2017-07-20 15:37:56 +02:00
Julien Duponchelle
23c3d32e06
Filter support for Docker
Fix #1110
2017-07-12 19:44:15 +02:00
Julien Duponchelle
f557ec4bda
Fix regression in docker introduce by 2.0 merge 2017-07-12 17:59:29 +02:00
Julien Duponchelle
699ecb7c89
Merge branch 'master' into 2.1 2017-07-11 18:59:50 +02:00
ziajka
e0f0adf3c8 Added preferred Docker API version. Fixes #2136 2017-07-06 11:24:55 +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
6a0345897d
Connector is no longer supported in ws_connect by aiohttp 2.0 2017-06-02 10:42:40 +02:00
Julien Duponchelle
7dfb634376
Fix for websocket usage with aiohttp 2.0
Fix #1050
2017-06-01 18:39:55 +02:00
Julien Duponchelle
93adef91d8
Merge branch '2.0' into 2.1 2017-05-31 16:58:31 +02:00
Julien Duponchelle
b8ee8d69c8
Fix unexpected keyword argument 'conn_timeout'
Fix #1047
2017-05-26 15:42:46 +02:00
Julien Duponchelle
5bb6c51698
Fix an error when logging Docker container fail to start 2017-05-23 13:31:04 +02:00
Julien Duponchelle
2a8911d19e
Keep DOCKER_MINIMUM_API_VERSION and DOCKER_MINIMUM_VERSION consistent 2017-05-23 11:00:15 +02:00
Bernhard Ehlers
8b7209ea78
Use docker version in error message of outdated docker installation 2017-05-23 10:41:42 +02:00
Bernhard Ehlers
7d48eba01b
Use versioned docker API
Since docker v1.13 the unversioned docker API is deprecated.
Backport of gns3-server 2.0, commit effbe59
2017-05-23 10:37:47 +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
Bernhard Ehlers
1b0f5c63b8
Fix connection to websocket with last docker release
Fix https://github.com/GNS3/gns3-gui/issues/1994

Signed-off-by: Julien Duponchelle <julien@gns3.net>
2017-04-28 16:03:26 +02:00
Julien Duponchelle
1a90305baa
Docker minimum api is 1.25 2017-04-24 18:43:12 +02:00
Julien Duponchelle
effbe59414
Lock docker API to 1.27
Fix https://github.com/GNS3/gns3-gui/issues/1994
2017-04-24 17:51:55 +02:00
Julien Duponchelle
8b9f22c30c
Handling server disconnect error when docker daemon die
Fix #985
2017-04-24 17:37:41 +02:00
Julien Duponchelle
7302f65ffe
Catch timeout error on docker
Fix #981
2017-04-18 11:44:20 +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
2564740665
Fix limit of 20 docker containers
Fix #963
2017-03-28 11:54:16 +02:00
Julien Duponchelle
132bc87081
Dissallow parallel pull of docker images
Fix #962
2017-03-27 20:46:25 +02:00
Julien Duponchelle
34f5a6f82c
Fix Session is closed when listing docker images
Fix #955
2017-03-20 23:50:31 +01:00
Julien Duponchelle
78c154e376
Cleanup docker source code 2017-03-20 20:30:59 +01:00
Julien Duponchelle
a571b1a2f8
Use aiohttp session for docker queries 2017-03-20 19:46:50 +01:00
Julien Duponchelle
a62b791c68
Fix TypeError: http_query() got an unexpected keyword argument 'timeout'
Fix #947
2017-03-20 17:06:00 +01:00
Julien Duponchelle
08bafc2dcc
Catch a timeout error in docker
Fix #936
2017-03-16 10:39:08 +01:00
Julien Duponchelle
666461277d
Fix a crash with some docker images
Fix #861
2017-01-10 10:09:34 +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
5a695d2651
Missing busybox for docker 2016-10-05 14:57:58 +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
32252e5193
Merge branch '1.5' into 2.0 2016-06-21 09:58:28 +02:00