Commit Graph

5988 Commits

Author SHA1 Message Date
grossmj
74782d413f
Change method to allocate AUX console for existing Dynamips nodes 2024-09-22 21:41:10 +07:00
grossmj
c41c11eb34
Backport auxiliary console support for Qemu, Docker and Dynamips nodes 2024-09-22 18:29:04 +07:00
Jeremy Grossmann
1f09a3e6bc
Merge pull request #2416 from GNS3/bugfix/2414
Run Docker containers with user namespaces enabled
2024-09-19 11:01:11 +07:00
grossmj
22f022cc22
Fix for running Docker containers with user namespaces enabled 2024-09-19 10:40:22 +07:00
grossmj
8429494280
Test base MAC address for Docker VMs 2024-09-19 10:19:07 +07:00
grossmj
a1666dd247
Fix MAC address support for Docker containers 2024-09-18 18:02:35 +07:00
grossmj
3214f52e9e
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/handlers/api/compute/docker_handler.py
#	gns3server/schemas/docker.py
#	gns3server/schemas/docker_template.py
#	tests/compute/docker/test_docker_vm.py
2024-09-18 17:29:06 +07:00
grossmj
ddd6235acd
Merge branch 'master' into 2.2 2024-09-18 17:14:21 +07:00
Jeremy Grossmann
bcc148bbd2
Merge pull request #2415 from GNS3/docker-mac-address
Support for custom MAC addresses in Docker containers
2024-09-18 04:05:18 -06:00
grossmj
3792901dc7
Support for configuring MAC address in Docker containers 2024-09-18 16:30:22 +07:00
赵昕彧
5ffe5fd9b3 Copying project files directly, rather than copying them in an import-export fashion, can make copying projects many times faster 2024-08-23 14:31:21 +08:00
grossmj
9bcf26b943
Release v3.0.0rc1 2024-08-11 11:35:19 -06:00
grossmj
b80e1f3a22
Downgrade aiohttp to v3.9.5 2024-08-11 11:22:20 -06:00
grossmj
ba13b0b078
Bundle web-ui v3.0.0rc1 2024-08-11 11:09:27 -06:00
grossmj
90c69d95ad
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.99a70a8d013fc974361c.js
#	gns3server/version.py
#	requirements.txt
2024-08-10 18:58:43 -06:00
grossmj
69a5b16bad
Upgrade aiohttp to v3.10.3 2024-08-11 01:34:30 +02:00
grossmj
21a5c5d3f2
Development on 2.2.50.dev1 2024-08-06 20:33:54 +02:00
Jeremy Grossmann
225779bc11
Merge pull request #2409 from GNS3/2.2
Release v2.2.49
2024-08-06 20:32:41 +02:00
grossmj
b1209155f5
Release v2.2.49 2024-08-06 12:55:15 +02:00
grossmj
7cebb9472a
Bundle web-ui v2.2.49 2024-08-06 12:41:06 +02:00
grossmj
00c3b1abc1
Merge remote-tracking branch 'origin/master' into 2.2 2024-08-06 12:37:55 +02:00
grossmj
b1c1c0520c
Sync appliances 2024-08-06 12:34:07 +02:00
grossmj
2bb26075f0
Forbid -nic and -nicdev in Qemu additional options. Fixes https://github.com/GNS3/gns3-server/issues/2397 2024-08-05 17:51:46 +02:00
grossmj
54e436394f
Upgrade packages in requirements.txt 2024-08-03 16:35:17 +02:00
grossmj
9046c60811
Fix tests by downgrading pytest-asyncio 2024-08-03 13:15:36 +02:00
grossmj
24cace8122
Merge remote-tracking branch 'origin/2.2' into 3.0
# Conflicts:
#	dev-requirements.txt
#	requirements.txt
#	setup.py
2024-08-03 12:58:19 +02:00
grossmj
6746ef39be
Upgrade development packages 2024-08-03 12:32:43 +02:00
grossmj
8889eaa439
Upgrade jsonschema and sentry-sdk packages 2024-08-03 12:32:06 +02:00
grossmj
95a4c284bc
Update IOU base configs to use "no ip domain lookup". Fixes #2404 2024-07-22 19:07:17 +02:00
Jeremy Grossmann
9a3bd2ee0c
Merge pull request #2406 from GNS3/feature/convert-invalid-node-names
Convert node hostnames for topologies
2024-07-20 18:01:50 +02:00
grossmj
2416069a6e
Update _convert_2.2.0() with correct comments 2024-07-20 17:55:38 +02:00
grossmj
eefb3d87b2
Fix tests and add conversion test 2024-07-20 17:47:25 +02:00
grossmj
999f41b03e
Convert topologies < 3.0 to have valid node hostnames 2024-07-20 17:22:24 +02:00
grossmj
ea339af1e9
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.a1204c9aa64b1cc15d28.js
2024-07-13 17:19:03 +02:00
grossmj
6951137a25
Development on 2.2.49.dev1 2024-07-13 16:32:13 +02:00
Jeremy Grossmann
cccbca3d5e
Merge pull request #2401 from GNS3/release/v2.2.48.1
Release v2.2.48.1
2024-07-13 14:43:53 +02:00
grossmj
8659439829
Release v2.2.48.1 2024-07-12 18:26:16 +02:00
grossmj
677bc389a5
Bundle web-ui v2.2.48.1 2024-07-11 23:44:24 +02:00
grossmj
3f7f5a3cda
Fix to access resources_path and install_builtin_appliances settings 2024-07-09 12:28:39 +02:00
grossmj
59ad5c55ec
Merge branch '2.2' into 3.0
# Conflicts:
#	CHANGELOG
#	gns3server/config_samples/gns3_server.conf
#	gns3server/controller/__init__.py
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.b65e52314df938ebe652.js
#	gns3server/version.py
2024-07-09 12:14:44 +02:00
grossmj
4a58ede550
Development on 2.2.49.dev1 2024-07-09 00:32:44 +02:00
Jeremy Grossmann
3f5b0bb514
Merge pull request #2395 from GNS3/2.2
Release v2.2.48
2024-07-09 00:30:55 +02:00
grossmj
6e8e0764c1
Release v2.2.48 2024-07-08 18:44:09 +02:00
grossmj
eaa18ad624
Bundle web-ui v2.2.48 2024-07-08 18:24:02 +02:00
grossmj
0a32be276e
Sync appliances 2024-07-08 18:18:25 +02:00
Jeremy Grossmann
271c958381
Merge pull request #2394 from GNS3/bugfix/2226
New path settings for the server config
2024-07-08 18:16:27 +02:00
grossmj
ca1d99b112
Add 'install_builtin_appliances' and 'resources_path' settings in the server config 2024-07-08 18:06:33 +02:00
grossmj
6b14abc06f
Add allow_unsafe_options for Qemu settings 2024-07-07 19:08:12 +02:00
grossmj
6ed18c561f
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/config_samples/gns3_server.conf
#	gns3server/controller/export_project.py
#	gns3server/controller/project.py
#	gns3server/controller/snapshot.py
#	gns3server/handlers/api/controller/project_handler.py
#	tests/controller/test_export_project.py
#	tests/controller/test_import_project.py
#	tests/controller/test_snapshot.py
2024-07-07 19:04:50 +02:00
Jeremy Grossmann
90dce03da2
Merge pull request #2392 from GNS3/bugfix/2385
Forbid unsafe Qemu additional options
2024-07-06 17:18:59 +02:00