Merge pull request #2511 from NAKNAO-nnct/feature/update-dockerfile-ubuntu-2404

Update Dockerfile base image to Ubuntu 24.04
refactor
2025-04-19 17:19:00 +00:00 · 2025-03-08 20:26:12 +07:00 · 2025-03-08 20:22:06 +09:00 · 2025-03-08 20:19:37 +09:00 · 2025-03-08 14:11:42 +09:00 · 2025-03-08 14:08:42 +09:00
22 changed files with 407 additions and 621 deletions
--- a/12
+++ b/12
@ -1,9 +1,19 @@
 # Change Log

+## 2.2.53 21/01/2025
+
+* Bundle web-ui v2.2.53
+* Add more information when patching .vbox file. Ref https://github.com/GNS3/gns3-gui/issues/3542
+* Increase timeout to run compute HTTP queries. Fixes #2461
+* Use 'allow_methods="*"' in aiohttp_cors.ResourceOptions(). Fixes #2459
+* Upgrade dependencies
+* Update remote-install.sh to support a custom repository and the deb822 source format
+* Fix: do not use the iourc file if IOU licence check is not enabled
+
+
 ## 2.2.52 02/12/2024

 * Bundle web-ui v2.2.52
-* Sync appliances
 * Remove restrictions based on file extension when listing images and fix ELF header checks
 * Fix use project name instead of ID for fast duplication when running local server. Fixes #2446
 * Overwrite user resources when the originals have changed.
--- a/21
+++ b/21
@ -1,24 +1,27 @@
 # Dockerfile for GNS3 server development

-FROM ubuntu:18.04
+FROM ubuntu:24.04

-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive

 # Set the locale
-ENV LANG en_US.UTF-8  
-ENV LANGUAGE en_US:en  
-ENV LC_ALL en_US.UTF-8 
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
+
+# this environment is externally managed
+ENV PIP_BREAK_SYSTEM_PACKAGES=1

 RUN apt-get update && apt-get install -y software-properties-common
 RUN add-apt-repository ppa:gns3/ppa
 RUN apt-get update && apt-get install -y \
    locales \
    python3-pip \
-    python3-dev \ 
+    python3-dev \
    qemu-system-x86 \
    qemu-kvm \
-    libvirt-bin \
-    x11vnc 
+    libvirt-daemon-system libvirt-clients \
+    x11vnc

 RUN locale-gen en_US.UTF-8

@ -32,4 +35,4 @@ RUN pip3 install --no-cache-dir -r /server/requirements.txt

 EXPOSE 3080

-CMD python3 -m gns3server
+CMD [ "python3", "-m", "gns3server", "--port", "3080" ]
--- a/README.md
+++ b/README.md
@ -112,6 +112,12 @@ For development, you can run the GNS3 server in a container
 bash scripts/docker_dev_server.sh
 ```

+#### use Docker Compose
+
+``` {.bash}
+docker compose up -d
+```
+
 ### Run as daemon (Unix only)

 You will find init sample scripts for various systems inside the init
--- a/compose.yaml
+++ b/compose.yaml
@ -0,0 +1,7 @@
+services:
+  gen3-server:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8001:3080"
--- a/gns3server/appliances/alpine-cloud.gns3a
+++ b/gns3server/appliances/alpine-cloud.gns3a
@ -0,0 +1,56 @@
+{
+    "appliance_id": "edbaa01e-2032-4ee2-bb9f-dd5c4d84c270",
+    "name": "Alpine Cloud Guest",
+    "category": "guest",
+    "description": "Alpine Linux is a security-oriented, lightweight Linux distribution based on musl libc and busybox.",
+    "vendor_name": "Alpine Linux Development Team",
+    "vendor_url": "http://alpinelinux.org",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Alpine Linux.png",
+    "documentation_url": "http://wiki.alpinelinux.org",
+    "product_name": "Alpine Linux",
+    "product_url": "https://www.alpinelinux.org/cloud/",
+    "registry_version": 4,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "\nUsername: alpine\nPassword: alpine",
+    "port_name_format": "Ethernet{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 1,
+        "ram": 1024,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "require",
+        "options": "-nographic"
+    },
+    "images": [
+        {
+            "filename": "generic_alpine-3.21.2-x86_64-bios-cloudinit-r0.qcow2",
+            "version": "3.21.2",
+            "md5sum": "b40825dff2867e0ffaffbc4c87674462",
+            "filesize": 189726720,
+            "download_url": "https://www.alpinelinux.org/cloud/",
+            "direct_download_url": "https://dl-cdn.alpinelinux.org/alpine/v3.21/releases/cloud/generic_alpine-3.21.2-x86_64-bios-cloudinit-r0.qcow2"
+        },
+        {
+            "filename": "alpine-cloud-init-data.iso",
+            "version": "1.0",
+            "md5sum": "b1b4b16cc3bf0250c0fa377c19c97683",
+            "filesize": 374784,
+            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/alpine-cloud",
+            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/alpine-cloud/alpine-cloud-init-data.iso"
+        }
+    ],
+    "versions": [
+        {
+            "name": "3.21.2",
+            "images": {
+                "hda_disk_image": "generic_alpine-3.21.2-x86_64-bios-cloudinit-r0.qcow2",
+                "cdrom_image": "alpine-cloud-init-data.iso"
+            }
+        }
+    ]
+}
--- a/gns3server/appliances/arista-veos.gns3a
+++ b/gns3server/appliances/arista-veos.gns3a
@ -2,14 +2,14 @@
    "appliance_id": "c90f3ff3-4ed2-4437-9afb-21232fa92015",
    "name": "Arista vEOS",
    "category": "multilayer_switch",
-    "description": "Arista EOS\u00ae is the core of Arista cloud networking solutions for next-generation data centers and cloud networks. Cloud architectures built with Arista EOS scale to tens of thousands of compute and storage nodes with management and provisioning capabilities that work at scale. Through its programmability, EOS enables a set of software applications that deliver workflow automation, high availability, unprecedented network visibility and analytics and rapid integration with a wide range of third-party applications for virtualization, management, automation and orchestration services.\n\nArista Extensible Operating System (EOS) is a fully programmable and highly modular, Linux-based network operation system, using familiar industry standard CLI and runs a single binary software image across the Arista switching family. Architected for resiliency and programmability, EOS has a unique multi-process state sharing architecture that separates state information and packet forwarding from protocol processing and application logic.",
+    "description": "Arista EOS is the core of Arista cloud networking solutions for next-generation data centers and cloud networks. Cloud architectures built with Arista EOS scale to tens of thousands of compute and storage nodes with management and provisioning capabilities that work at scale. Through its programmability, EOS enables a set of software applications that deliver workflow automation, high availability, unprecedented network visibility and analytics and rapid integration with a wide range of third-party applications for virtualization, management, automation and orchestration services.\n\nArista Extensible Operating System (EOS) is a fully programmable and highly modular, Linux-based network operation system, using familiar industry standard CLI and runs a single binary software image across the Arista switching family. Architected for resiliency and programmability, EOS has a unique multi-process state sharing architecture that separates state information and packet forwarding from protocol processing and application logic.",
    "vendor_name": "Arista",
    "vendor_url": "http://www.arista.com/",
    "documentation_url": "https://www.arista.com/assets/data/docs/Manuals/EOS-4.17.2F-Manual.pdf",
    "product_name": "vEOS",
    "product_url": "https://eos.arista.com/",
    "registry_version": 4,
-    "status": "experimental",
+    "status": "stable",
    "maintainer": "GNS3 Team",
    "maintainer_email": "developers@gns3.net",
    "usage": "The login is admin, with no password by default",
@ -29,87 +29,24 @@
    },
    "images": [
        {
-            "filename": "vEOS64-lab-4.32.0F.vmdk",
-            "version": "4.32.0F",
-            "md5sum": "851771260bb18ad3e90fa6956f0c6161",
-            "filesize": 591724544,
+            "filename": "vEOS-lab-4.33.1F.qcow2",
+            "version": "4.33.1F",
+            "md5sum": "8f662409c0732ed9f682edce63601e8a",
+            "filesize": 611909632,
            "download_url": "https://www.arista.com/en/support/software-download"
        },
        {
-            "filename": "vEOS64-lab-4.31.3M.vmdk",
-            "version": "4.31.3M",
-            "md5sum": "7df107da137f4a4e752014d4f0e94cd3",
-            "filesize": 577961984,
+            "filename": "vEOS-lab-4.32.3M.qcow2",
+            "version": "4.32.3M",
+            "md5sum": "46fc46f5ed1da8752eed8396f08862f8",
+            "filesize": 605683712,
            "download_url": "https://www.arista.com/en/support/software-download"
        },
        {
-            "filename": "vEOS64-lab-4.30.6M.vmdk",
-            "version": "4.30.6M",
-            "md5sum": "19721aace820b9ebf6d7ae6524803cf5",
-            "filesize": 553123840,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS64-lab-4.29.8M.vmdk",
-            "version": "4.29.8M",
-            "md5sum": "131888f74cd63a93894521d40eb4d0b6",
-            "filesize": 548405248,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS64-lab-4.28.11M.vmdk",
-            "version": "4.28.11M",
-            "md5sum": "6cac0e7b04a74ee0dc358327a00accfd",
-            "filesize": 513343488,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS64-lab-4.27.12M.vmdk",
-            "version": "4.27.12M",
-            "md5sum": "34c4f785c7fc054cda8754dd13c0d7c7",
-            "filesize": 496697344,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.32.0F.vmdk",
-            "version": "4.32.0F",
-            "md5sum": "584b901a1249717504050e48f74fb8dd",
-            "filesize": 591396864,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.31.3M.vmdk",
-            "version": "4.31.3M",
-            "md5sum": "a2e130697cdf8547006eebebde6eefca",
-            "filesize": 590086144,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.30.6M.vmdk",
-            "version": "4.30.6M",
-            "md5sum": "a4467648bcfa7b19640af8a4ad3153c6",
-            "filesize": 565968896,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.29.8M.vmdk",
-            "version": "4.29.8M",
-            "md5sum": "1952f6114a4376212c525db9ec8efd5f",
-            "filesize": 558039040,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.28.11M.vmdk",
-            "version": "4.28.11M",
-            "md5sum": "5502df24dfc231c45afb33d6018c16d0",
-            "filesize": 521338880,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.27.12M.vmdk",
-            "version": "4.27.12M",
-            "md5sum": "e08a97e7c1977993f947fedeb4c6ddd5",
-            "filesize": 504299520,
+            "filename": "vEOS-lab-4.31.6M.qcow2",
+            "version": "4.31.6M",
+            "md5sum": "7410110b77472f058322ec4681f8a356",
+            "filesize": 590479360,
            "download_url": "https://www.arista.com/en/support/software-download"
        },
        {
@ -118,459 +55,28 @@
            "md5sum": "8d7e754efebca1930a93a2587ff7606c",
            "filesize": 6291456,
            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.26.2F.vmdk",
-            "version": "4.26.2F",
-            "md5sum": "de8ce9750fddb63bd3f71bccfcd7651e",
-            "filesize": 475332608,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.25.3M.vmdk",
-            "version": "4.25.3M",
-            "md5sum": "2f196969036b4d283e86f15118d59c26",
-            "filesize": 451543040,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.24.3M.vmdk",
-            "version": "4.24.3M",
-            "md5sum": "0a28e44c7ce4a8965f24a4a463a89b7d",
-            "filesize": 455213056,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.24.2.1F.vmdk",
-            "version": "4.24.2.1F",
-            "md5sum": "6bab8b59ce5230e243e56f4127448fc8",
-            "filesize": 455213056,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.23.4.2M.vmdk",
-            "version": "4.23.4.2M",
-            "md5sum": "d21cbef4e39f1e783b13a926cb54a242",
-            "filesize": 454295552,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.23.0.1F.vmdk",
-            "version": "4.23.0.1F",
-            "md5sum": "08d52154aa11a834aef9f42bbf29f977",
-            "filesize": 439484416,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.22.2.1F.vmdk",
-            "version": "4.22.2.1F",
-            "md5sum": "2a425bf8efe569a2bdf0e328f240cd16",
-            "filesize": 426377216,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.22.0F.vmdk",
-            "version": "4.22.0F",
-            "md5sum": "cfcc75c2b8176cfd819afcfd6799b74c",
-            "filesize": 414121984,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.21.1.1F.vmdk",
-            "version": "4.21.1F",
-            "md5sum": "02bfb7e53781fd44ff02357f201586d9",
-            "filesize": 358809600,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.20.10M-combined.vmdk",
-            "version": "4.20.10M-combined",
-            "md5sum": "d1f2d650f93dbf24e04fdd2c9d62bd62",
-            "filesize": 334626816,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.20.1F.vmdk",
-            "version": "4.20.1F",
-            "md5sum": "aadb6f3dbff28317f68cb4c4502d0db8",
-            "filesize": 662044672,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.19.10M-combined.vmdk",
-            "version": "4.19.10M-combined",
-            "md5sum": "103daa45c33be4584cbe6adc60de46a3",
-            "filesize": 324141056,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.19.10M.vmdk",
-            "version": "4.19.10M",
-            "md5sum": "665ed14389411ae5f16ba0a2ff84240a",
-            "filesize": 637337600,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.18.10M-combined.vmdk",
-            "version": "4.18.10M-combined",
-            "md5sum": "e33e0ef5b8cecc84c5bb57569b36b9c6",
-            "filesize": 317652992,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.18.10M.vmdk",
-            "version": "4.18.10M",
-            "md5sum": "1d87e9ace37fe3706dbf3e49c8d4d231",
-            "filesize": 624427008,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.18.5M.vmdk",
-            "version": "4.18.5M",
-            "md5sum": "b1ee6268dbaf2b2276fd7a5286c7ce2b",
-            "filesize": 623116288,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.18.1F.vmdk",
-            "version": "4.18.1F",
-            "md5sum": "9648c63185f3b793b47528a858ca4364",
-            "filesize": 620625920,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.17.8M.vmdk",
-            "version": "4.17.8M",
-            "md5sum": "afc79a06f930ea2cc0ae3e03cbfd3f23",
-            "filesize": 608829440,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.17.2F.vmdk",
-            "version": "4.17.2F",
-            "md5sum": "3b4845edfa77cf9aaeb9c0a005d3e277",
-            "filesize": 609615872,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.16.13M.vmdk",
-            "version": "4.16.13M",
-            "md5sum": "4d0facf90140fc3aab031f0f8f88a32f",
-            "filesize": 521404416,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.16.6M.vmdk",
-            "version": "4.16.6M",
-            "md5sum": "b3f7b7cee17f2e66bb38b453a4939fef",
-            "filesize": 519962624,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.15.10M.vmdk",
-            "version": "4.15.10M",
-            "md5sum": "98e08281a9c48ddf6f3c5d62a124a20f",
-            "filesize": 517079040,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.15.5M.vmdk",
-            "version": "4.15.5M",
-            "md5sum": "cd74bb69c7ee905ac3d33c4d109f3ab7",
-            "filesize": 516030464,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.14.14M.vmdk",
-            "version": "4.14.14M",
-            "md5sum": "d81ba0522f4d7838d96f7985e41cdc47",
-            "filesize": 422641664,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.13.16M.vmdk",
-            "version": "4.13.16M",
-            "md5sum": "5763b2c043830c341c8b1009f4ea9a49",
-            "filesize": 404684800,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "vEOS-lab-4.13.8M.vmdk",
-            "version": "4.13.8M",
-            "md5sum": "a47145b9e6e7a24171c0850f8755535e",
-            "filesize": 409010176,
-            "download_url": "https://www.arista.com/en/support/software-download"
-        },
-        {
-            "filename": "Aboot-veos-serial-8.0.0.iso",
-            "version": "8.0.0",
-            "md5sum": "488ad1c435d18c69bb8d69c7806457c9",
-            "filesize": 5242880,
-            "download_url": "https://www.arista.com/en/support/software-download"
        }
    ],
    "versions": [
        {
-            "name": "4.32.0F",
+            "name": "4.33.1F",
            "images": {
                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
-                "hdb_disk_image": "vEOS64-lab-4.32.0F.vmdk"
+                "hdb_disk_image": "vEOS-lab-4.33.1F.qcow2"
            }
        },
        {
-            "name": "4.31.3M",
+            "name": "4.32.3M",
            "images": {
                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
-                "hdb_disk_image": "vEOS64-lab-4.31.3M.vmdk"
+                "hdb_disk_image": "vEOS-lab-4.32.3M.qcow2"
            }
        },
        {
-            "name": "4.30.6M",
+            "name": "4.31.6M",
            "images": {
                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
-                "hdb_disk_image": "vEOS64-lab-4.30.6M.vmdk"
-            }
-        },
-        {
-            "name": "4.29.8M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
-                "hdb_disk_image": "vEOS64-lab-4.29.8M.vmdk"
-            }
-        },
-        {
-            "name": "4.28.11M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
-                "hdb_disk_image": "vEOS64-lab-4.28.11M.vmdk"
-            }
-        },
-        {
-            "name": "4.27.12M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
-                "hdb_disk_image": "vEOS64-lab-4.27.12M.vmdk"
-            }
-        },
-        {
-            "name": "4.32.0F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
-                "hdb_disk_image": "vEOS-lab-4.32.0F.vmdk"
-            }
-        },
-        {
-            "name": "4.31.3M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
-                "hdb_disk_image": "vEOS-lab-4.31.3M.vmdk"
-            }
-        },
-        {
-            "name": "4.30.6M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
-                "hdb_disk_image": "vEOS-lab-4.30.6M.vmdk"
-            }
-        },
-        {
-            "name": "4.29.8M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
-                "hdb_disk_image": "vEOS-lab-4.29.8M.vmdk"
-            }
-        },
-        {
-            "name": "4.28.11M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
-                "hdb_disk_image": "vEOS-lab-4.28.11M.vmdk"
-            }
-        },
-        {
-            "name": "4.27.12M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.2.iso",
-                "hdb_disk_image": "vEOS-lab-4.27.12M.vmdk"
-            }
-        },
-        {
-            "name": "4.26.2F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.26.2F.vmdk"
-            }
-        },
-        {
-            "name": "4.25.3M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.25.3M.vmdk"
-            }
-        },
-        {
-            "name": "4.24.3M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.24.3M.vmdk"
-            }
-        },
-        {
-            "name": "4.24.2.1F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.24.2.1F.vmdk"
-            }
-        },
-        {
-            "name": "4.23.4.2M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.23.4.2M.vmdk"
-            }
-        },
-        {
-            "name": "4.23.0.1F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.23.0.1F.vmdk"
-            }
-        },
-        {
-            "name": "4.22.2.1F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.22.2.1F.vmdk"
-            }
-        },
-        {
-            "name": "4.22.0F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.22.0F.vmdk"
-            }
-        },
-        {
-            "name": "4.21.1F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.21.1.1F.vmdk"
-            }
-        },
-        {
-            "name": "4.20.10M-combined",
-            "images": {
-                "hda_disk_image": "vEOS-lab-4.20.10M-combined.vmdk"
-            }
-        },
-        {
-            "name": "4.20.1F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.20.1F.vmdk"
-            }
-        },
-        {
-            "name": "4.19.10M-combined",
-            "images": {
-                "hda_disk_image": "vEOS-lab-4.19.10M-combined.vmdk"
-            }
-        },
-        {
-            "name": "4.19.10M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.19.10M.vmdk"
-            }
-        },
-        {
-            "name": "4.18.10M-combined",
-            "images": {
-                "hda_disk_image": "vEOS-lab-4.18.10M-combined.vmdk"
-            }
-        },
-        {
-            "name": "4.18.10M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.18.10M.vmdk"
-            }
-        },
-        {
-            "name": "4.18.5M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.18.5M.vmdk"
-            }
-        },
-        {
-            "name": "4.18.1F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.18.1F.vmdk"
-            }
-        },
-        {
-            "name": "4.17.8M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.17.8M.vmdk"
-            }
-        },
-        {
-            "name": "4.17.2F",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.17.2F.vmdk"
-            }
-        },
-        {
-            "name": "4.16.13M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.16.13M.vmdk"
-            }
-        },
-        {
-            "name": "4.16.6M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.16.6M.vmdk"
-            }
-        },
-        {
-            "name": "4.15.10M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.15.10M.vmdk"
-            }
-        },
-        {
-            "name": "4.15.5M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.15.5M.vmdk"
-            }
-        },
-        {
-            "name": "4.14.14M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.14.14M.vmdk"
-            }
-        },
-        {
-            "name": "4.13.16M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.13.16M.vmdk"
-            }
-        },
-        {
-            "name": "4.13.8M",
-            "images": {
-                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
-                "hdb_disk_image": "vEOS-lab-4.13.8M.vmdk"
+                "hdb_disk_image": "vEOS-lab-4.31.6M.qcow2"
            }
        }
    ]
--- a/gns3server/appliances/cisco-iou-l2.gns3a
+++ b/gns3server/appliances/cisco-iou-l2.gns3a
@ -25,7 +25,7 @@
            "filesize": 243251976
        },
        {
-            "filename": "x86_64_crb_linux_l2-adventerprisek9-ms.bin",
+            "filename": "x86_64_crb_linux_l2-adventerprisek9-ms",
            "version": "17.12.1",
            "md5sum": "2b5055e4cef8fd257416d74a94adb626",
            "filesize": 240355720
@ -59,7 +59,7 @@
        {
            "name": "17.12.1",
            "images": {
-                "image": "x86_64_crb_linux_l2-adventerprisek9-ms.bin"
+                "image": "x86_64_crb_linux_l2-adventerprisek9-ms"
            }
        },
        {
--- a/gns3server/appliances/cisco-iou-l3.gns3a
+++ b/gns3server/appliances/cisco-iou-l3.gns3a
@ -25,7 +25,7 @@
            "filesize": 292001512
        },
        {
-            "filename": "x86_64_crb_linux-adventerprisek9-ms.bin",
+            "filename": "x86_64_crb_linux-adventerprisek9-ms",
            "version": "17.12.1",
            "md5sum": "4a2fce8de21d1831fbceffd155e41ae7",
            "filesize": 288947184
@ -59,7 +59,7 @@
        {
            "name": "17.12.1",
            "images": {
-                "image": "x86_64_crb_linux-adventerprisek9-ms.bin"
+                "image": "x86_64_crb_linux-adventerprisek9-ms"
            }
        },
        {
--- a/gns3server/appliances/innovaphone-app.gns3a
+++ b/gns3server/appliances/innovaphone-app.gns3a
@ -0,0 +1,50 @@
+{
+    "appliance_id": "92dbd0e9-144e-4c59-a4a8-97b6a1661818",
+    "name": "Innovaphone App-Platform",
+    "category": "guest",
+    "description": "In addition to telephony, apps for Video Telephony, Chat, Conferencing, Application Sharing and many other functions have become indispensable UCC tools in the area of business communication. Based on the myApps platform and its various components, innovaphone provides a collaborative work and communication platform for enhanced corporate communications \u2013 regardless of the location and the device being used. The innovaphone platform myApps consists of many independent components that work well individually, yet unfold their remarkable performance when combined.",
+    "vendor_name": "Innovaphone",
+    "vendor_url": "https://www.innovaphone.com",
+    "vendor_logo_url": "https://www.innovaphone.com/content/downloads/innovaphone-myapps-logo-short-without-background-screen.png",
+    "documentation_url": "https://wiki.innovaphone.com/index.php?title=Reference14r2:Concept_App_Platform",
+    "product_name": "App-Platform",
+    "product_url": "https://www.innovaphone.com/en/products/myapps/myapps-platform.html",
+    "registry_version": 4,
+    "status": "experimental",
+    "availability": "free-to-try",
+    "maintainer": "Thomas Marchsteiner",
+    "maintainer_email": "thomas.marchsteiner@acp.at",
+    "usage": "Default users console:root/iplinux , ssh:admin/ipapps , Webinterface:pwd \nAfter first boot wait for automatic reboot.\nA static ip can be set via the setip utility. \nLoading another keymap can be done via the loadkeys command. \nThe app-platform-disk1.vmdk file is contained within an ova file. \nIt can be extraced with the tar utility, 7Zip or any other tool which can handle tar files.",
+    "symbol": "innovaphone-ap-icon.jpg",
+    "first_port_name": "eth0",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 1,
+        "ram": 512,
+        "cpus": 1,
+        "hda_disk_interface": "scsi",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "boot_priority": "d",
+        "kvm": "allow",
+        "on_close": "power_off",
+        "process_priority": "normal"
+    },
+    "images": [
+        {
+            "filename": "app-platform-disk1_120010.vmdk",
+            "version": "12.0010",
+            "md5sum": "d5a5a77f682c2c988b0810935d79a787",
+            "filesize": 129474560,
+            "download_url": "https://store.innovaphone.com/"
+        }
+    ],
+    "versions": [
+        {
+            "images": {
+                "hda_disk_image": "app-platform-disk1_120010.vmdk"
+            },
+            "name": "12.0010"
+        }
+    ]
+}
--- a/gns3server/appliances/innovaphone-ipva.gns3a
+++ b/gns3server/appliances/innovaphone-ipva.gns3a
@ -0,0 +1,78 @@
+{
+    "appliance_id": "ddf8f7a4-60c0-4c9d-849c-ffc3c9d1d082",
+    "name": "Innovaphone IPVA",
+    "category": "guest",
+    "description": "The innovaphone PBX is a professional IP telephone system. The IPVA is a software-only solution. It appears as and performs as an innovaphone 'hard-box' excluding DSP-, ISDN-/AB-resources.",
+    "vendor_name": "Innovaphone",
+    "vendor_url": "https://www.innovaphone.com/",
+    "vendor_logo_url": "https://www.innovaphone.com/content/downloads/innovaphone-myapps-logo-short-without-background-screen.png",
+    "documentation_url": "https://wiki.innovaphone.com/index.php?title=Reference15r1:Concept_Innovaphone_Virtual_Appliance_(IPVA)",
+    "product_name": "IPVA",
+    "product_url": "https://www.innovaphone.com/en/products/innovaphone-pbx.html",
+    "registry_version": 4,
+    "status": "experimental",
+    "availability": "free-to-try",
+    "maintainer": "Thomas Marchsteiner",
+    "maintainer_email": "thomas.marchsteiner@acp.at",
+    "usage": "Default user admin/ipva \nDefault network configuration: DHCP client on eth0 with fallback to static address 192.168.0.1/24 after timeout. Static address 192.168.1.1/24 on eth1\n The ova in the zip file contains the disk images to run this appliance. Disableing the dhcp client and setting a static IP is possible with the following commands:\n> config change IP0 ETH0 /addr 192.168.0.1 /mask 255.255.255.0 \n> config change DHCP0 /mode off \n> config write \n> config activate \n> reset",
+    "symbol": "innovaphone-pbx-green.png",
+    "first_port_name": "eth0",
+    "port_name_format": "eth{port1}",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 2,
+        "ram": 256,
+        "cpus": 1,
+        "hda_disk_interface": "ide",
+        "hdb_disk_interface": "ide",
+        "hdc_disk_interface": "ide",
+        "hdd_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "boot_priority": "d",
+        "kvm": "allow",
+        "on_close": "power_off",
+        "process_priority": "normal"
+    },
+    "images": [
+        {
+            "filename": "ipva-qemu-disk1-14r2.vmdk",
+            "version": "14r2",
+            "md5sum": "aaa1c3885eee30ca6ffa3827619e8643",
+            "filesize": 6269952,
+            "download_url": "https://store.innovaphone.com/"
+        },
+        {
+            "filename": "ipva-qemu-disk2-14r2.vmdk",
+            "version": "14r2",
+            "md5sum": "008a8fc6b0b1e5f11a3e7fd6f22ba349",
+            "filesize": 72192,
+            "download_url": "https://store.innovaphone.com/"
+        },
+        {
+            "filename": "ipva-qemu-disk3-14r2.vmdk",
+            "version": "14r2",
+            "md5sum": "20516731c480e2112b3fb4a4d7f514f2",
+            "filesize": 68096,
+            "download_url": "https://store.innovaphone.com/"
+        },
+        {
+            "filename": "ipva-qemu-disk4-14r2.vmdk",
+            "version": "14r2",
+            "md5sum": "15d7d79ef8c28bd29b2eceac8405f964",
+            "filesize": 68096,
+            "download_url": "https://store.innovaphone.com/"
+        }
+    ],
+    "versions": [
+        {
+            "images": {
+                "hda_disk_image": "ipva-qemu-disk1-14r2.vmdk",
+                "hdb_disk_image": "ipva-qemu-disk2-14r2.vmdk",
+                "hdc_disk_image": "ipva-qemu-disk3-14r2.vmdk",
+                "hdd_disk_image": "ipva-qemu-disk4-14r2.vmdk"
+            },
+            "name": "14r2"
+        }
+    ]
+}
--- a/gns3server/appliances/pfsense.gns3a
+++ b/gns3server/appliances/pfsense.gns3a
@ -24,6 +24,13 @@
        "process_priority": "normal"
    },
    "images": [
+        {
+            "filename": "pfSense-CE-2.7.2-RELEASE-amd64.iso",
+            "version": "2.7.2",
+            "md5sum": "50c3e723d68ec74d038041a34fa846f8",
+            "filesize": 874672128,
+            "download_url": "https://www.pfsense.org/download/mirror.php?section=downloads"
+        },
        {
            "filename": "pfSense-CE-2.7.0-RELEASE-amd64.iso",
            "version": "2.7.0",
@ -76,6 +83,13 @@
        }
    ],
    "versions": [
+        {
+            "name": "2.7.2",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "pfSense-CE-2.7.2-RELEASE-amd64.iso"
+            }
+        },
        {
            "name": "2.7.0",
            "images": {
--- a/gns3server/appliances/stormshield-eva.gns3a
+++ b/gns3server/appliances/stormshield-eva.gns3a
@ -0,0 +1,50 @@
+{
+    "appliance_id": "60801097-332e-4f40-a63e-8ad62047c01f",
+    "name": "Stormshield EVA",
+    "category": "firewall",
+    "description": "Stormshield EVA (Elastic Virtual Appliance) is a french virtual firewall designed to protect network infrastructures. It offers advanced features such as filtering, intrusion prevention (IPS), VPN management (IPSec/SSL), and access control.",
+    "vendor_name": "Stormshield",
+    "vendor_url": "https://www.stormshield.com/",
+    "vendor_logo_url": "https://www.stormshield.com/wp-content/uploads/stormshield-logo.png",
+    "documentation_url": "https://www.stormshield.com/fr/ressourcescenter/network-security-elastic-virtual-appliances/",
+    "product_name": "Stormshield EVA",
+    "product_url": "https://www.stormshield.com/fr/produits-et-services/produits/protection-des-reseaux/nos-produits/appliances-virtuelles/",
+    "registry_version": 4,
+    "status": "stable",
+    "availability": "service-contract",
+    "maintainer": "Samy SCANNA",
+    "maintainer_email": "samy.scanna@outlook.com",
+    "usage": "After the first boot, the appliance automatically runs the configuration script to set up the password, and network interfaces.",
+    "symbol": "stormshield.png",
+    "port_name_format": "port{port1}",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 8,
+        "ram": 2048,
+        "cpus": 1,
+        "hda_disk_interface": "scsi",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "allow",
+        "options": "-serial stdio",
+        "on_close": "shutdown_signal",
+        "process_priority": "normal"
+    },
+    "images": [
+        {
+            "filename": "utm-SNS-EVA-4.3.33-kvm.qcow2",
+            "version": "4.3.33",
+            "md5sum": "21d94d0e20f2e270f06c5853fd750d5b",
+            "filesize": 284360704,
+            "download_url": "https://mystormshield.eu/product/download/"
+        }
+    ],
+    "versions": [
+        {
+            "images": {
+                "hda_disk_image": "utm-SNS-EVA-4.3.33-kvm.qcow2"
+            },
+            "name": "4.3.33"
+        }
+    ]
+}
--- a/gns3server/compute/virtualbox/virtualbox_vm.py
+++ b/gns3server/compute/virtualbox/virtualbox_vm.py
@ -218,28 +218,45 @@ class VirtualBoxVM(BaseNode):
        """
        Fix the VM uuid in the case of linked clone
        """
-        if os.path.exists(self._linked_vbox_file()):
-            try:
-                tree = ET.parse(self._linked_vbox_file())
-            except ET.ParseError:
-                raise VirtualBoxError("Cannot modify VirtualBox linked nodes file. "
-                                      "File {} is corrupted.".format(self._linked_vbox_file()))
-            except OSError as e:
-                raise VirtualBoxError("Cannot modify VirtualBox linked nodes file '{}': {}".format(self._linked_vbox_file(), e))

-            machine = tree.getroot().find("{http://www.virtualbox.org/}Machine")
-            if machine is not None and machine.get("uuid") != "{" + self.id + "}":
+        linked_vbox_file = self._linked_vbox_file()
+        if not os.path.exists(linked_vbox_file):
+            raise VirtualBoxError("Cannot find VirtualBox linked node file: {}".format(linked_vbox_file))

-                for image in tree.getroot().findall("{http://www.virtualbox.org/}Image"):
-                    currentSnapshot = machine.get("currentSnapshot")
-                    if currentSnapshot:
-                        newSnapshot = re.sub(r"\{.*\}", "{" + str(uuid.uuid4()) + "}", currentSnapshot)
-                    shutil.move(os.path.join(self.working_dir, self._vmname, "Snapshots", currentSnapshot) + ".vdi",
-                                os.path.join(self.working_dir, self._vmname, "Snapshots", newSnapshot) + ".vdi")
-                    image.set("uuid", newSnapshot)
+        try:
+            tree = ET.parse(linked_vbox_file)
+        except ET.ParseError:
+            raise VirtualBoxError("Cannot modify VirtualBox linked node file. "
+                                  "File {} is corrupted.".format(linked_vbox_file))
+        except OSError as e:
+            raise VirtualBoxError("Cannot modify VirtualBox linked node file '{}': {}".format(linked_vbox_file, e))

-                machine.set("uuid", "{" + self.id + "}")
-                tree.write(self._linked_vbox_file())
+        machine = tree.getroot().find("{http://www.virtualbox.org/}Machine")
+        if machine is not None and machine.get("uuid") != "{" + self.id + "}":
+
+            for image in tree.getroot().findall("{http://www.virtualbox.org/}Image"):
+                currentSnapshot = machine.get("currentSnapshot")
+                if currentSnapshot:
+                    newSnapshot = re.sub(r"\{.*\}", "{" + str(uuid.uuid4()) + "}", currentSnapshot)
+                shutil.move(
+                    os.path.join(self.working_dir, self._vmname, "Snapshots", currentSnapshot) + ".vdi",
+                    os.path.join(self.working_dir, self._vmname, "Snapshots", newSnapshot) + ".vdi"
+                )
+                log.info("VirtualBox VM '{name}' [{id}] snapshot file moved from '{current}' to '{new}'".format(
+                    name=self.name,
+                    id=self.id,
+                    current=currentSnapshot,
+                    new=newSnapshot,
+                ))
+                image.set("uuid", newSnapshot)
+
+            log.info("VirtualBox VM '{name}' [{id}] '{vbox_file}' has been patched".format(
+                name=self.name,
+                id=self.id,
+                vbox_file=linked_vbox_file,
+            ))
+            machine.set("uuid", "{" + self.id + "}")
+            tree.write(linked_vbox_file)

    async def check_hw_virtualization(self):
        """
@ -458,7 +475,7 @@ class VirtualBoxVM(BaseNode):

    async def save_linked_hdds_info(self):
        """
-        Save linked cloned hard disks information.
+        Save linked cloned hard disk information.

        :returns: disk table information
        """
--- a/gns3server/controller/compute.py
+++ b/gns3server/controller/compute.py
@ -18,14 +18,19 @@
 import ipaddress
 import aiohttp
 import asyncio
-import async_timeout
 import socket
 import json
 import uuid
 import sys
 import io
+
 from operator import itemgetter

+if sys.version_info >= (3, 11):
+    from asyncio import timeout as asynctimeout
+else:
+    from async_timeout import timeout as asynctimeout
+
 from ..utils import parse_version
 from ..utils.asyncio import locking
 from ..controller.controller_error import ControllerError
@ -483,8 +488,8 @@ class Compute:
        """ Returns URL for specific path at Compute"""
        return self._getUrl(path)

-    async def _run_http_query(self, method, path, data=None, timeout=20, raw=False):
-        async with async_timeout.timeout(delay=timeout):
+    async def _run_http_query(self, method, path, data=None, timeout=120, raw=False):
+        async with asynctimeout(delay=timeout):
            url = self._getUrl(path)
            headers = {}
            headers['content-type'] = 'application/json'
--- a/gns3server/crash_report.py
+++ b/gns3server/crash_report.py
@ -57,7 +57,7 @@ class CrashReport:
    Report crash to a third party service
    """

-    DSN = "https://b2ea85d65646be3f56aebf2458337918@o19455.ingest.us.sentry.io/38482"
+    DSN = "https://98c55f74bc61432b375d3eb392af9f7d@o19455.ingest.us.sentry.io/38482"
    _instance = None

    def __init__(self):
--- a/gns3server/static/web-ui/index.html
+++ b/gns3server/static/web-ui/index.html
@ -46,6 +46,6 @@

      gtag('config', 'G-0BT7QQV1W1');
    </script>
-  <script src="runtime.415291667f70565cd8ef.js" defer></script><script src="polyfills-es5.865074f5cd9a121111a2.js" nomodule defer></script><script src="polyfills.2f91a039d848e57ff02e.js" defer></script><script src="main.9297104511b6616fc55c.js" defer></script>
+  <script src="runtime.415291667f70565cd8ef.js" defer></script><script src="polyfills-es5.865074f5cd9a121111a2.js" nomodule defer></script><script src="polyfills.2f91a039d848e57ff02e.js" defer></script><script src="main.c83939cdfe3af0ec27df.js" defer></script>

 </body></html>
--- a/gns3server/static/web-ui/main.c83939cdfe3af0ec27df.js
+++ b/gns3server/static/web-ui/main.c83939cdfe3af0ec27df.js
--- a/gns3server/version.py
+++ b/gns3server/version.py
@ -23,8 +23,8 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)

-__version__ = "2.2.53.dev1"
-__version_info__ = (2, 2, 53, 99)
+__version__ = "2.2.53"
+__version_info__ = (2, 2, 53, 0)

 if "dev" in __version__:
    try:
--- a/gns3server/web/web_server.py
+++ b/gns3server/web/web_server.py
@ -311,7 +311,13 @@ class WebServer:
        # Background task started with the server
        self._app.on_startup.append(self._on_startup)

-        resource_options = aiohttp_cors.ResourceOptions(allow_credentials=True, expose_headers="*", allow_headers="*", max_age=0)
+        resource_options = aiohttp_cors.ResourceOptions(
+            allow_credentials=True,
+            expose_headers="*",
+            allow_headers="*",
+            allow_methods="*",
+            max_age=0
+        )

        # Allow CORS for this domains
        cors = aiohttp_cors.setup(self._app, defaults={
--- a/requirements.txt
+++ b/requirements.txt
@ -2,10 +2,10 @@ jsonschema>=4.23,<4.24
 aiohttp>=3.10.10,<3.11
 aiohttp-cors>=0.7.0,<0.8
 aiofiles>=24.1.0,<25.0
-Jinja2>=3.1.4,<3.2
-sentry-sdk>=2.17,<2.18  # optional dependency
-psutil>=6.1.0
-async-timeout>=4.0.3,<4.1
+Jinja2>=3.1.5,<3.2
+sentry-sdk>=2.19.2,<2.20  # optional dependency
+psutil>=6.1.1
+async-timeout>=5.0.1,<5.1
 distro>=1.9.0
 py-cpuinfo>=9.0.0,<10.0
 platformdirs>=2.4.0,<3  # platformdirs >=3 conflicts when building Debian packages
--- a/scripts/remote-install.sh
+++ b/scripts/remote-install.sh
@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2024 GNS3 Technologies Inc.
+# Copyright (C) 2025 GNS3 Technologies Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -28,6 +28,7 @@ function help {
  echo "--with-i386-repository: Add the i386 repositories required by IOU i386 images. This is not needed for recent x86_64 IOU images." >&2
  echo "--with-welcome: Install GNS3-VM welcome.py script" >&2
  echo "--without-kvm: Disable KVM, required if system do not support it (limitation in some hypervisors and cloud providers). Warning: only disable KVM if strictly necessary as this will degrade performance" >&2
+  echo "--without-system-upgrade: Do not upgrade the system" >&2
  echo "--unstable: Use the GNS3 unstable repository" >&2
  echo "--custom-repository <repository>: Use a custom repository" >&2
  echo "--help: This help" >&2
@ -38,6 +39,13 @@ function log {
 }

 lsb_release -d | grep "LTS" > /dev/null
+
+if [ "$EUID" -ne 0 ]
+then
+  echo "This script must be run as root"
+  exit 1
+fi
+
 if [ $? != 0 ]
 then
  echo "This script can only be run on a Linux Ubuntu LTS release"
@ -52,6 +60,7 @@ USE_VPN=0
 USE_IOU=0
 I386_REPO=0
 DISABLE_KVM=0
+NO_SYSTEM_UPGRADE=0
 WELCOME_SETUP=0

 TEMP=`getopt -o h --long with-openvpn,with-iou,with-i386-repository,with-welcome,without-kvm,unstable,custom-repository:,help -n 'gns3-remote-install.sh' -- "$@"`
@ -85,6 +94,10 @@ while true ; do
          DISABLE_KVM=1
          shift
          ;;
+        --without-system-upgrade)
+          NO_SYSTEM_UPGRADE=1
+          shift
+          ;;
        --unstable)
          REPOSITORY="unstable"
          shift
@ -102,68 +115,33 @@ while true ; do
    esac
 done

+if [ "$REPOSITORY" == "ppa-v3" ]
+then
+  if ! python3 -c 'import sys; assert sys.version_info >= (3,9)' > /dev/null 2>&1; then
+    echo "GNS3 version >= 3.0 requires Python 3.9 or later"
+    exit 1
+  fi
+fi
+
 # Exit in case of error
 set -e

 export DEBIAN_FRONTEND="noninteractive"
 UBUNTU_CODENAME=`lsb_release -c -s`

-log "Add GNS3 repository"
+log "Updating system packages, installing curl and software-properties-common"
+apt update
+apt install -y curl software-properties-common

-if [ ! -f "/etc/apt/sources.list.d/ubuntu.sources" ]
+if [ $NO_SYSTEM_UPGRADE == 0 ]
 then
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B83AAABFFBD82D21B543C8EA86C22C2EC6A24D7F
-    cat <<EOFLIST > /etc/apt/sources.list.d/gns3.list
-deb http://ppa.launchpad.net/gns3/ppa/ubuntu $UBUNTU_CODENAME main
-deb-src http://ppa.launchpad.net/gns3/ppa/ubuntu $UBUNTU_CODENAME main
-EOFLIST
-
-else
-
-    cat <<EOFLIST > /etc/apt/sources.list.d/gns3-ppa.sources
-Types: deb
-URIs: https://ppa.launchpadcontent.net/gns3/$REPOSITORY/ubuntu/
-Suites: $UBUNTU_CODENAME
-Components: main
-Signed-By:
- -----BEGIN PGP PUBLIC KEY BLOCK-----
- .
- mQINBGY0jSYBEADMH5CvX8ZVX4XzAxdQ2CmF7t86IjFnQgtI18Q19nVnpKEGNyB5
- pgotDMzkhGnxuhvz2zE9PZhd8VgkodB81V607d/Dy8FfI7t1BVQhLvJDx0H/q6RE
- n2y9WxiuBzTHitoQTCTY3hjcr7AUNFFI64gUqwbkQmYbCWWsYOlDpRSkWKg8P8WK
- 08RetwTI0Iwoz8j+BkbPlubuImiVfh1TeH23FBuGIwL1r1Cps0wel6JAi+jaU9WG
- j8MX3mQYFTAtk7f1lRubqWosB/A4xIu609pF1e1tAkWAGltYAeoFhDn+PfA9KgmV
- fvxfVR7zmxp31imTJgXgUFCz+H0Xb3vpve8XsrsHZUP6StJ3+6cFXjNBV6PuO1FT
- JWp86a+AYHg7+sUWcoJRZPCTbb/pOcCa0q1ch5qcLkiYEOGK+pYhbPptq6y8IsJW
- N6EDNCVvVqVyTJy14FZWoOqxcpUiDOQ+su28j8++V+PMo+FO3SQqwEZwJXk7LF/4
- wUipDCUh/WNjDqqgmYLoO+ttiiJPbEw3jtbO+zopbzYpyEC1f06Nz7uz1daOIN3J
- etFPzSqWCE7Eq+hoVmAAm8gVmQir3rFJbIGBAvAaOLQEOkUlOlS7AezqUhdyhGER
- Zrvc3eNqxY7G61SEHipEJ7/hpcDq0RRWCXHsoQqyHaPje826n2pGkJYt4QARAQAB
- tBZMYXVuY2hwYWQgUFBBIGZvciBHTlMziQJOBBMBCgA4FiEEuDqqv/vYLSG1Q8jq
- hsIsLsaiTX8FAmY0jSYCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQhsIs
- LsaiTX9z9xAAq1uHmRgfYmELS0cr2YEnTWHPVE6s95Qx+0cr5zzNeWfmoAS9uSyl
- z8bCm+Q2ZapzU/nOtkozU+RGjgcRRTKMVTyS0PjFX22965xHCRWnw79fPyrYouUw
- H2cAT8WSGYEeVAbqhJSns0RnDpXuaxmWE1wT+iitY/QAjeXo22Z2mjv2bFTitKbY
- hZbE5Eu8Olc5YHCVI0ofq84/Ii921iMibU6EDMmm/iOnMK2uHGbC59t0YG8Rm7mK
- uk6+TpxOULjFeCWSkF2Dr33m8JQmtYZuFUnmqWPuSdBo3J0O1b0qTg+EP9FbDAtj
- CoEKT/V1ccMBd3r77o23CGsvpV7bzEU60A+NsU8vb/AkOmouYiF+qaYDFGZDfWhK
- p1HFmd1kt7YdgxsmoKoFJkbt1bBdcFJLV0Jcad5sfArg2aFDYf2giMxAw4iQ+9jc
- MCuwWxiqWicPqJ5erNTzVfayBkjuZqBDVTO9wmG3DL4QmNosIBS7kq+NGrT8Ql22
- FqYfdIZJDlKVtJKHK8eKJSB0dbFawV2h5p/CvQlIm6nthg5FzOyjvCkPkvxvveq+
- SuNxFEscumFCgo7j7RMWHW9HWK3TUvMmYLMVjxL8kXyCwknp9GklBQHA/IPxRa/2
- eFqqkmVbmNAoMzzw5wqa/BPcFEbgn+E+TFyZqbzp0F4QzPJZFkz16SA=
- =xnj5
- -----END PGP PUBLIC KEY BLOCK-----
-EOFLIST
-
+  log "Upgrading system packages"
+  apt upgrade --yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"
 fi

-log "Updating system packages and installing curl"
-apt update
-apt install -y curl
-
-log "Upgrading packages"
-apt upgrade --yes --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"
+log "Adding GNS3 repository ppa:gns3/$REPOSITORY"
+# use sudo -E to preserve proxy config
+sudo -E apt-add-repository -y "ppa:gns3/$REPOSITORY"

 log "Installing the GNS3 server and its dependencies"
 apt install -y gns3-server
--- a/tests/controller/test_compute.py
+++ b/tests/controller/test_compute.py
@ -85,7 +85,7 @@ async def test_compute_httpQuery(compute):
        response.status = 200
        await compute.post("/projects", {"a": "b"})
        await compute.close()
-        mock.assert_called_with("POST", "https://example.com:84/v2/compute/projects", data=b'{"a": "b"}', headers={'content-type': 'application/json'}, auth=None, chunked=None, timeout=20)
+        mock.assert_called_with("POST", "https://example.com:84/v2/compute/projects", data=b'{"a": "b"}', headers={'content-type': 'application/json'}, auth=None, chunked=None, timeout=120)
        assert compute._auth is None


@ -99,7 +99,7 @@ async def test_compute_httpQueryAuth(compute):
        compute.password = "toor"
        await compute.post("/projects", {"a": "b"})
        await compute.close()
-        mock.assert_called_with("POST", "https://example.com:84/v2/compute/projects", data=b'{"a": "b"}', headers={'content-type': 'application/json'}, auth=compute._auth, chunked=None, timeout=20)
+        mock.assert_called_with("POST", "https://example.com:84/v2/compute/projects", data=b'{"a": "b"}', headers={'content-type': 'application/json'}, auth=compute._auth, chunked=None, timeout=120)
        assert compute._auth.login == "root"
        assert compute._auth.password == "toor"

@ -156,7 +156,7 @@ async def test_compute_httpQueryNotConnectedInvalidVersion(compute):
    with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
        with pytest.raises(aiohttp.web.HTTPConflict):
            await compute.post("/projects", {"a": "b"})
-        mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=20)
+        mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=120)
        await compute.close()


@ -169,7 +169,7 @@ async def test_compute_httpQueryNotConnectedNonGNS3Server(compute):
    with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
        with pytest.raises(aiohttp.web.HTTPConflict):
            await compute.post("/projects", {"a": "b"})
-        mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=20)
+        mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=120)
        await compute.close()


@ -182,7 +182,7 @@ async def test_compute_httpQueryNotConnectedNonGNS3Server2(compute):
    with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
        with pytest.raises(aiohttp.web.HTTPConflict):
            await compute.post("/projects", {"a": "b"})
-        mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=20)
+        mock.assert_any_call("GET", "https://example.com:84/v2/compute/capabilities", headers={'content-type': 'application/json'}, data=None, auth=None, chunked=None, timeout=120)


 async def test_compute_httpQueryError(compute):
@ -217,7 +217,7 @@ async def test_compute_httpQuery_project(compute):
            project = Project(name="Test")
            mock_notification.assert_called()
        await compute.post("/projects", project)
-        mock.assert_called_with("POST", "https://example.com:84/v2/compute/projects", data=json.dumps(project.__json__()), headers={'content-type': 'application/json'}, auth=None, chunked=None, timeout=20)
+        mock.assert_called_with("POST", "https://example.com:84/v2/compute/projects", data=json.dumps(project.__json__()), headers={'content-type': 'application/json'}, auth=None, chunked=None, timeout=120)
        await compute.close()

 # FIXME: https://github.com/aio-libs/aiohttp/issues/2525
@ -424,7 +424,7 @@ async def test_interfaces(compute):
    response.status = 200
    with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
        assert await compute.interfaces() == res
-        mock.assert_any_call("GET", "https://example.com:84/v2/compute/network/interfaces", auth=None, chunked=None, data=None, headers={'content-type': 'application/json'}, timeout=20)
+        mock.assert_any_call("GET", "https://example.com:84/v2/compute/network/interfaces", auth=None, chunked=None, data=None, headers={'content-type': 'application/json'}, timeout=120)
        await compute.close()
Author	SHA1	Message	Date
Jeremy Grossmann	483719568f	Merge pull request #2511 from NAKNAO-nnct/feature/update-dockerfile-ubuntu-2404 Update Dockerfile base image to Ubuntu 24.04	2025-03-08 20:26:12 +07:00
NAKNAO-nnct	018598a300	refactor	2025-03-08 20:22:06 +09:00
NAKNAO-nnct	e262a46cfd	rm space	2025-03-08 20:19:37 +09:00
NAKNAO-nnct	00bf1c028b	Update README to Run Docker Compose	2025-03-08 14:11:42 +09:00
NAKNAO-nnct	21ebb934f4	add compose.yaml	2025-03-08 14:08:42 +09:00
NAKNAO-nnct	2ecd2cfe3b	update Ubuntu24.04	2025-03-08 13:59:05 +09:00
Jeremy Grossmann	ce4b3091dd	Merge pull request #2507 from GNS3/fix-remote-install-script Improvements for remote-install.sh	2025-03-03 05:55:42 +07:00
grossmj	f722816849	Improvements for remote-install.sh * Use apt-add-repository to install repository * Add option to not upgrade the system * Check if Python version is >= 3.9 when installing from ppa-v3 repository	2025-03-02 22:27:53 +07:00
Jeremy Grossmann	4cb38b23eb	Merge pull request #2506 from FedericoTorres233/patch-1 Check if remote-install.sh is being run as root	2025-03-02 16:14:33 +08:00
Federico Torres	f3e46227d8	fix: check if remote-install.sh is being run as root	2025-03-01 16:56:21 -03:00
Jeremy Grossmann	185cd01e19	Merge pull request #2488 from GNS3/release/v2.2.53 Release v2.2.53	2025-01-21 09:47:43 +07:00
grossmj	369fcaa512	Release v2.2.53	2025-01-21 11:52:11 +10:00
grossmj	7b7d3d676f	Bundle web-ui v2.2.53	2025-01-21 11:43:11 +10:00
grossmj	d1186b2acc	Sync appliances	2025-01-21 11:29:28 +10:00
grossmj	bd58196817	Add more information when patching .vbox file. Ref https://github.com/GNS3/gns3-gui/issues/3542	2025-01-20 13:22:22 +10:00
grossmj	ccc8974d92	Fix tests	2024-12-30 16:14:33 +07:00
grossmj	0090ff3722	Increase timeout to run compute HTTP queries. Fixes #2461	2024-12-30 16:10:04 +07:00
grossmj	2c727c6bd2	Use 'allow_methods="*"' in aiohttp_cors.ResourceOptions(). Fixes #2459	2024-12-30 11:06:19 +07:00
grossmj	13b0caef4f	Upgrade dependencies	2024-12-30 10:49:35 +07:00