d45d52f15c
Support Xtigervnc restart.
2018-11-11 23:23:30 +08:00
36474f7bab
Merge branch '2.1' into 2.2
...
# Conflicts:
# gns3server/compute/docker/docker_vm.py
2018-11-11 22:31:29 +08:00
d0bab9947e
Support tigervnc in Docker VM. Ref #1438
2018-11-11 21:07:33 +08:00
2764828f38
Refactor how clients access PCAP capture files. Fixes https://github.com/GNS3/gns3-gui/issues/2438 .
...
* The PCAP file is directly accessed if controller and client are on the same host.
* The PCAP file is streamed from the compute server to the client with the controller as a proxy when the controller is remote for the client.
2018-10-27 14:47:17 +07:00
86f87aec74
Fix installation with Python 3.7. Fixes #1414 .
...
Fix deprecated use of aiohttp.Timeout. Fixes #1296 .
Use "async with" with aiohttp.ClientSession().
Make sure websocket connections are properly closed, see https://docs.aiohttp.org/en/stable/web_advanced.html#graceful-shutdown
Finish to drop Python 3.4.
2018-10-16 15:56:06 +07:00
de5934f818
Merge remote-tracking branch 'origin/2.2' into 2.2
2018-10-15 17:06:25 +07:00
76af98404a
Drop Python 3.4 and switch to async / await syntax for asyncio. Fixes #1425
2018-10-15 17:05:49 +07:00
14fb64b941
Added "/sbin" to init script PATH variable so that its possible to
...
use more sophosticated dhcp clients (compared to the udhcpc that is
provided by busybox) by installing them into the docker image in
the normal way.
2018-10-06 16:06:24 +01:00
8baa480b79
Fix tests.
2018-10-06 21:57:03 +08:00
97c68f56bf
Notify users if x11vnc process has crashed. Fix #1401 .
2018-10-06 21:30:39 +08:00
9de13c570c
Merge branch '2.1' into 2.2
...
# Conflicts:
# gns3server/compute/builtin/nodes/cloud.py
# gns3server/compute/docker/docker_vm.py
# gns3server/compute/dynamips/nodes/ethernet_switch.py
# gns3server/compute/iou/iou_vm.py
# gns3server/compute/qemu/qemu_vm.py
# gns3server/compute/virtualbox/virtualbox_vm.py
# gns3server/compute/vmware/vmware_vm.py
# gns3server/controller/__init__.py
# gns3server/version.py
# gns3server/web/web_server.py
2018-10-04 15:44:13 +02:00
17d657c919
Fix small errors like unhandled exceptions etc.
2018-09-11 15:06:01 +02:00
4021a13651
Catch exceptions in various locations to fix small issues reported by Sentry.
2018-09-06 09:49:12 +02:00
f8ecd61a98
Notify users if xvfb process or x11vnc process have crashed. Ref #1401 .
2018-09-05 15:16:07 +08:00
33e8710495
Merge branch '2.1' into 2.2
...
# Conflicts:
# gns3server/compute/docker/docker_vm.py
# gns3server/controller/compute.py
# gns3server/controller/gns3vm/__init__.py
# gns3server/controller/link.py
# gns3server/controller/project.py
# gns3server/handlers/api/controller/project_handler.py
# gns3server/handlers/api/controller/server_handler.py
# gns3server/utils/asyncio/__init__.py
# gns3server/utils/asyncio/telnet_server.py
# gns3server/version.py
# gns3server/web/web_server.py
# tests/compute/qemu/test_qemu_vm.py
2018-08-29 15:57:54 +07:00
902de3dd47
Refactor asyncio locking system for Python 3.7 support. Ref https://github.com/GNS3/gns3-gui/issues/2566 Ref https://github.com/GNS3/gns3-gui/issues/2568
2018-08-25 14:10:47 +07:00
3560cda06c
Use asyncio.ensure_future() instead of asyncio.async() with conservative approach to support Python < 3.4.4. Fixes https://github.com/GNS3/gns3-gui/issues/2566
2018-08-24 18:57:18 +07:00
033f005bde
Merge branch '2.1' into 2.2
...
# Conflicts:
# gns3server/compute/docker/docker_vm.py
# gns3server/version.py
2018-08-07 21:06:42 +07:00
b2e0a1b291
Don't release NIO UDP ports when updating docker container.
...
When a docker container was updated, the NIO UDP ports were being released
from port_manager, but they were still stored in self._ethernet_adapters.
When the container was restarted, the same NIO ports would be used. However,
if a new connection was then added, it could assign a port that was already
in use. The end result was that traffic would be bridged across the wrong
interface connection.
2018-06-11 15:17:13 +12:00
d1ccf3bc84
Merge branch '2.1' into 2.2
...
# Conflicts:
# gns3server/version.py
# requirements.txt
2018-06-04 22:46:52 +07:00
c52342907a
Merge pull request #1332 from GNS3/global-vars
...
Docker `ExtraHosts`, global variables for project and supplier support, Fixes : #2482
2018-05-15 09:23:54 +02:00
83445214be
Support for nested global variables
2018-05-09 11:25:55 +02:00
e267f8a8b8
Project global variables
2018-05-04 14:34:44 +02:00
21a1800edc
Merge branch '2.1' into 2.2
...
# Conflicts:
# gns3server/controller/__init__.py
# gns3server/controller/export_project.py
# gns3server/controller/import_project.py
# gns3server/controller/project.py
# gns3server/version.py
2018-04-28 19:41:12 +07:00
305fe2e817
Handle asyncio timeouts. Ref #1307 .
2018-04-28 17:42:02 +07:00
80958e8a6d
support based on init.sh, Ref: #2482
2018-04-27 14:33:07 +02:00
43081152ef
Add support of ExtraHosts for Docker, Ref. gns3-gui#2482
2018-04-25 16:03:01 +02:00
2ea0aa5ded
Merge branch '2.1' into 2.2
...
# Conflicts:
# gns3server/compute/iou/iou_vm.py
# gns3server/compute/virtualbox/virtualbox_vm.py
# gns3server/compute/vmware/vmware_vm.py
2018-04-18 17:08:42 +08:00
a12c5a95b0
Catch exceptions when using AsyncioTelnetServer. Fixes #1321 .
2018-04-16 15:30:06 +08:00
90ce6093d8
Some spring cleaning.
2018-03-15 14:17:39 +07:00
658aa4bae9
Merge 2.1 into 2.2 branch
2018-03-12 13:38:50 +07:00
e79e27a73f
Handle docker env with last empty line, Fixes : #2420
2018-02-27 16:33:55 +01:00
4ba523a0d7
Add an error message when Docker container is not ready to be started. Ref #1281 .
2018-02-02 16:29:08 +08:00
07d2d7b340
Update documentation.
2018-01-31 23:37:02 +07:00
eeae07e783
Conservative approach to supported versions of Python 3.4 and asyncio.ensure_future, Ref. #1269
2018-01-29 12:13:20 +01:00
d9a0ec9ff3
Replace asyncio.async with ensure_future because of deprecation, Fixes : #1269
2018-01-24 11:11:53 +01:00
630afc5469
Do not overwrites persistent Docker volumes. Fixes #2358 .
2017-12-17 22:35:26 +01:00
dd89b09f84
Fix error when updating packet filter on stopped Docker link. Fixes #1229 .
2017-11-23 10:04:32 +07:00
3d85bba9d4
Don't create directory structure during json dump. Fixes #2270
2017-10-02 10:41:57 +02:00
a567b394f3
Restore file permissions fails for volumes with soft links. Fixes #1180 .
2017-09-21 22:45:17 +08:00
a93f3b0576
Fix permission on exited container
...
If a container is exited we quickly start it to fix
the permissions.
Fix https://github.com/GNS3/gns3-gui/issues/2181
2017-07-26 14:52:16 +02:00
ec4e69b0d8
Ensure, that the docker mount directory exists
...
Fix #1097
Signed-off-by: Julien Duponchelle <julien@gns3.net >
2017-07-20 16:12:20 +02:00
b33ba5f8ea
Don't allow user to overwrite GNS3 docker environment variables
...
Fix #1098
2017-07-20 15:37:56 +02:00
23c3d32e06
Filter support for Docker
...
Fix #1110
2017-07-12 19:44:15 +02:00
f557ec4bda
Fix regression in docker introduce by 2.0 merge
2017-07-12 17:59:29 +02:00
699ecb7c89
Merge branch 'master' into 2.1
2017-07-11 18:59:50 +02:00
e0f0adf3c8
Added preferred Docker API version. Fixes #2136
2017-07-06 11:24:55 +02:00
8e8b8bc5a5
WebSocket binary mode support for docker
2017-07-06 10:13:00 +02:00
c6f9ec3758
More information on Docker WebSocket error
2017-07-05 10:36:58 +02:00
6a0345897d
Connector is no longer supported in ws_connect by aiohttp 2.0
2017-06-02 10:42:40 +02:00
