Merge pull request #2538 from Nick1200000/enhancement/docker-build

Add automated Docker build and publish workflow

.github/workflows/docker-build.yml

@@ -0,0 +1,39 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches: [ main, master, enhancement/**, dev ]
+  pull_request:
+    branches: [ main, master, enhancement/**, dev ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GH_TOKEN }}
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build and push to GitHub Container Registry
+      run: |
+        docker build -t ghcr.io/$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]'):latest .
+        docker push ghcr.io/$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]'):latest
+
+    - name: Build and push to Docker Hub
+      run: |
+        docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:latest .
+        docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}:latest

gns3server/schemas/template.py

@@ -27,7 +27,7 @@ BASE_TEMPLATE_PROPERTIES = {
     },
     "template_type": {
         "description": "Type of node",
-        "enum": ["cloud", "nat", "ethernet_hub", "ethernet_switch", "docker", "dynamips", "vpcs", "traceng",
+        "enum": ["cloud", "ethernet_hub", "ethernet_switch", "docker", "dynamips", "vpcs", "traceng",
                  "virtualbox", "vmware", "iou", "qemu"]
     },
     "name": {

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.55.dev1"
-__version_info__ = (2, 2, 54, 99)
+__version__ = "2.2.54"
+__version_info__ = (2, 2, 54, 0)
 
 if "dev" in __version__:
     try: