grossmj
c11b3c3911
Fix tests after merge
2023-09-06 23:42:50 +07:00
grossmj
1ec056c1a6
Merge branch '2.2' into 3.0
...
# Conflicts:
# gns3server/compute/docker/docker_vm.py
# gns3server/controller/__init__.py
# gns3server/controller/appliance_manager.py
# gns3server/web/route.py
# requirements.txt
# tests/compute/docker/test_docker_vm.py
2023-09-06 23:30:00 +07:00
grossmj
d6e1ee5dbb
Prevent X11 socket file to be modified by Docker container
2023-08-27 18:30:37 +10:00
grossmj
f3b6825e40
Test if busybox is not dynamically linked
2023-08-11 14:10:25 +10:00
grossmj
1cb433c5bc
New packaging relying only pyproject.toml
2023-08-10 22:44:37 +10:00
grossmj
1ff23348d3
Merge branch '2.2' into 3.0
...
# Conflicts:
# gns3server/compute/base_node.py
# gns3server/compute/docker/__init__.py
# gns3server/compute/qemu/qemu_vm.py
# gns3server/controller/compute.py
# gns3server/controller/gns3vm/virtualbox_gns3_vm.py
# gns3server/controller/node.py
# gns3server/controller/project.py
# gns3server/crash_report.py
# gns3server/handlers/api/controller/template_handler.py
# gns3server/static/web-ui/index.html
# gns3server/static/web-ui/main.8448c96e4facbe79a613.js
# gns3server/version.py
# tests/compute/iou/test_iou_vm.py
# tests/compute/qemu/test_qemu_vm.py
# tests/handlers/api/controller/test_template.py
2023-06-20 16:06:53 +09:30
grossmj
84c886b058
Remove left over Xvfb related code
2023-05-31 21:33:39 +09:30
grossmj
e59b5fb95b
Remove Xvfb + x11vnc support
2023-05-31 21:28:06 +09:30
grossmj
b3dfb87622
Merge branch '2.2' into 3.0
...
# Conflicts:
# gns3server/controller/__init__.py
# gns3server/crash_report.py
# gns3server/static/web-ui/index.html
# gns3server/static/web-ui/main.96be36058f5df0ca7e7f.js
# gns3server/utils/images.py
# gns3server/version.py
# requirements.txt
# tests/compute/docker/test_docker_vm.py
# tests/controller/test_controller.py
2023-05-22 15:11:17 +08:00
grossmj
d6141d4652
Fix checking for ":" in project dir on Windows for Docker containers
2023-03-23 22:17:29 -10:00
grossmj
f08ce9d3f1
Check for colon in project name. Fixes #2203
2023-03-19 18:26:26 +10:00
grossmj
3fb138b9a1
Allow ':' in project name when Docker containers are used
2023-03-19 17:29:29 +10:00
grossmj
e5c8ae4bde
Use a stock BusyBox for the Docker integration
2023-01-01 17:04:48 +08:00
grossmj
80f5ca0c3f
Checks for valid hostname on server side for Dynamips, IOU, Qemu and Docker nodes
2022-07-17 11:51:29 +02:00
grossmj
d303d13045
Merge branch '2.2' into 3.0
...
# Conflicts:
# gns3server/compute/base_node.py
# gns3server/compute/docker/docker_vm.py
# gns3server/compute/iou/iou_vm.py
# gns3server/controller/template_manager.py
# gns3server/handlers/api/compute/docker_handler.py
# gns3server/handlers/api/compute/dynamips_vm_handler.py
# gns3server/handlers/api/compute/iou_handler.py
# gns3server/handlers/api/compute/qemu_handler.py
# gns3server/handlers/api/compute/virtualbox_handler.py
# gns3server/handlers/api/compute/vmware_handler.py
# gns3server/handlers/api/compute/vpcs_handler.py
# gns3server/handlers/api/controller/node_handler.py
# gns3server/version.py
# requirements.txt
# tests/controller/test_controller.py
# tests/controller/test_project.py
# tests/handlers/api/controller/test_node.py
2022-06-21 16:45:25 +02:00
grossmj
908911e764
Remove parameter "Name" not useful to create a Docker container
2022-06-18 19:41:20 +02:00
grossmj
bdd703a0dc
Support to reset all console connections. Ref https://github.com/GNS3/gns3-server/issues/1619
2022-06-15 15:30:44 +02:00
grossmj
2eb64200a4
Add spaces before hostname for Docker network config. Ref #2039
2022-06-12 19:32:34 +08:00
grossmj
988ca7574c
Add hostname entry to sample network config for Docker nodes. Fixes #2039
2022-06-08 01:07:31 +08:00
grossmj
527d4bb3ea
Run Xtigervnc with MIT-SHM extension disabled for Docker VNC console support. Fixes #2071
2022-06-08 00:05:24 +08:00
grossmj
df50b46952
Merge branch '2.2' into 3.0
...
# Conflicts:
# gns3server/compute/docker/docker_vm.py
# gns3server/version.py
# requirements.txt
2022-04-27 22:23:05 +07:00
grossmj
1837850894
Docker: load custom interface files from /etc/network/interfaces (commented by default). Ref #2052
2022-04-27 18:37:09 +07:00
grossmj
890dbd9f77
Create /etc/network/interfaces.d
in Docker container. Fixes #2052
2022-04-20 22:59:51 +07:00
grossmj
460fe5ed95
Prettify Docker '/etc/network/interfaces' file. Ref #2040
2022-04-20 19:29:56 +07:00
grossmj
f8a83e7ff9
Merge branch '2.2' into 3.0
...
# Conflicts:
# dev-requirements.txt
# gns3server/compute/qemu/qemu_vm.py
# gns3server/version.py
# requirements.txt
2022-03-13 14:50:02 +10:30
grossmj
7490be6d5e
Support GNS3 variables in Docker environment variables. Fixes #2033
2022-02-23 14:33:30 +10:30
grossmj
296446189f
Merge branch '2.2' into 3.0
...
# Conflicts:
# gns3server/appliances/Simulator.gns3a
# gns3server/compute/docker/__init__.py
# gns3server/compute/docker/docker_vm.py
# gns3server/version.py
2021-12-02 19:57:04 +10:30
grossmj
b1a62dfdc2
Fix unhandled KeyError exception when starting Docker container. Ref #1991
2021-11-04 16:59:35 +10:30
grossmj
6a726d0344
Fix formatting issue.
2021-06-03 19:32:00 +09:30
grossmj
9b0e3a77ed
Use a stock BusyBox for the Docker Integration
2021-06-03 18:38:08 +09:30
grossmj
cefab8d362
Rename __json__() to asdict()
2021-04-17 23:34:28 +09:30
grossmj
c021e21309
Use black with -l 120 param.
2021-04-13 18:46:50 +09:30
grossmj
f928738bd5
Use pyupgrade with --py36-plus param.
2021-04-13 18:37:58 +09:30
grossmj
c043830e3f
Move endpoints to routes & preparations to use a database.
2020-11-19 15:21:03 +10:30
grossmj
acc5c7ebfa
Update package versions.
...
Do not use Path in schemas (causes issues with empty paths).
Change how notifications are handled.
Run tests with Python 3.9
2020-11-11 17:18:41 +10:30
grossmj
7043d48f1a
Auxiliary console support for Qemu. Ref #2873
...
Improvements for auxiliary console support for Docker and Dynamips.
2020-07-29 16:23:51 +09:30
grossmj
831ee5f468
Support to reset all console connections. Ref https://github.com/GNS3/gns3-server/issues/1619
2020-07-26 18:27:18 +09:30
grossmj
d1c29c8bb7
Resource constraints for Docker VMs.
2020-07-18 21:03:55 +09:30
grossmj
f498ab06b4
Wait longer for x11 socket file to be created. Ref #1761
2020-06-10 20:37:13 +09:30
grossmj
8536af33da
Fix tests.
2020-04-28 13:49:05 +09:30
fadlytabrani
6fd60452c4
Add clipboard support for TigerVnc
...
There's currently no clipboard support for servers running on TigerVnc. TigerVnc clipboard support is provided by vncconfig that needs to be spawned for every display socket. The code changes above provides that functionality
2020-04-16 00:14:20 +10:00
grossmj
afbbf7a524
Add Xvnc command to the VNC servers list. Fixes #172
2020-03-19 19:06:51 +10:30
Karim
af78031322
Resolve conflicts in docker volumes instead of error. Fixes https://github.com/GNS3/gns3-server/issues/1595
2019-06-05 10:40:40 +01:00
Karim
81ddb0cfe6
Impoved docker volumes user input validation
2019-04-22 12:46:28 +01:00
Karim
0c19bc8d43
Support for additional persistent docker volumes to be specified within appliance configuration
2019-04-22 10:26:41 +01:00
Karim
6df93d4db0
Updated tests for setting docker user
2019-04-05 11:06:35 +01:00
Karim
7c3a38d379
Support for docker images that set the USER directive. Changes the
...
docker user to root for the init script to configure the network,
then drops to the configured user (or root if one is not defined)
for continuing booting the image.
2019-04-05 08:51:57 +01:00
grossmj
a17119187b
Fix remote packet capture for Dynamips.
2019-04-01 20:58:18 +07:00
grossmj
4cc5dbc228
Fix remote packet capture and make sure packet capture is stopped when deleting an NIO. Fixes https://github.com/GNS3/gns3-gui/issues/2753
2019-04-01 19:47:31 +07:00
grossmj
5754747a90
Merging 2.1 into 2.2
2019-02-22 18:04:49 +07:00