From 6cbf3baa1b03ad1c21a4fe05d13a87938211ccdd Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Mon, 1 Sep 2025 17:49:34 +0200
Subject: [PATCH 1/5] Update docker-build.yml

---
 .github/workflows/docker-build.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 50add974f..2163840e4 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -1,10 +1,11 @@
 name: Build and Push Docker Image
 
 on:
+  workflow_dispatch:
   push:
-    branches: [ main, master, enhancement/**, dev ]
+    branches: [ master, '2.2', '3.3' ]
   pull_request:
-    branches: [ main, master, enhancement/**, dev ]
+    branches: [ master, '2.2', '3.3' ]
 
 jobs:
   build:

From a394fb71dc1fe3a41f6633e3a7289b1d1981d35e Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Mon, 1 Sep 2025 17:55:46 +0200
Subject: [PATCH 2/5] Update method to login to ghcr.io

---
 .github/workflows/docker-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 2163840e4..0c08c35de 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -19,8 +19,8 @@ jobs:
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GH_TOKEN }}
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Login to Docker Hub
       uses: docker/login-action@v3

From dc9c3b1c5db0b09042f81bfdf423699c7a527a71 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Mon, 1 Sep 2025 18:17:52 +0200
Subject: [PATCH 3/5] Fix pushing Docker image to Docker hub

---
 .github/workflows/docker-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 0c08c35de..07674f444 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -36,5 +36,5 @@ jobs:
 
     - 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
+        docker build -t gns3/${{ github.event.repository.name }}:latest .
+        docker push gns3/${{ github.event.repository.name }}:latest

From 565a76ae27ee99d70f5aa43f79ae17413fec04e2 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Mon, 1 Sep 2025 18:23:52 +0200
Subject: [PATCH 4/5] Only build and push Docker image when releasing a new
 version

---
 .github/workflows/docker-build.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 07674f444..e1397da8b 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -3,9 +3,7 @@ name: Build and Push Docker Image
 on:
   workflow_dispatch:
   push:
-    branches: [ master, '2.2', '3.3' ]
-  pull_request:
-    branches: [ master, '2.2', '3.3' ]
+    tags: ['v2.*', 'v3.*']
 
 jobs:
   build:

From a34fa53823f6c1bc133a25829f287790f430fd00 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Mon, 1 Sep 2025 18:27:04 +0200
Subject: [PATCH 5/5] Update tags

---
 .github/workflows/docker-build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index e1397da8b..fec449ba2 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -3,7 +3,9 @@ name: Build and Push Docker Image
 on:
   workflow_dispatch:
   push:
-    tags: ['v2.*', 'v3.*']
+    tags:
+      - v2.*
+      - v3.*
 
 jobs:
   build: