From 415f9ed669b7ae988aec09cc37fe8c89a084a5ef Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Mon, 11 Mar 2024 10:25:15 +0000
Subject: [PATCH 01/17] test

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 18e870e55b..0b3eb81fe2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Hubble v2
 
+Update
+
 To run a fresh local network - run `./scripts/run_local.sh`
 To run on the same network with updated evm code(it preserves all evm state) - run `./scripts/upgrade_local.sh`
 To kill network - run `avalanche network stop && avalanche network clean`

From 8249f196a624e6205c9466f453c9f03f0d8f322a Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Tue, 12 Mar 2024 17:55:46 +0000
Subject: [PATCH 02/17] test github action hubblenet

---
 .github/workflows/ci-oonodz-aylin.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/ci-oonodz-aylin.yml

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
new file mode 100644
index 0000000000..97726a64dd
--- /dev/null
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -0,0 +1,27 @@
+name: Build + Push ooNodz image
+
+on:
+  push:
+    branches:
+      - aylin
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build_oonodz_image:
+    name: Build Docker Image
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Login to Docker
+        run: echo ${{ secrets.docker_pass }} | docker login --username ${{ secrets.docker_username }} --password-stdin
+      - name: Build Dockerfile for Fuji
+        run: |
+          CURRENT_BRANCH=${{ github.head_ref || github.ref_name }} 
+          PUSH_DOCKER_IMAGE=true 
+          GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c1-7)
+          BUILD_IMAGE_ID=${AVALANCHE_VERSION}-fuji-${GITHUB_SHA_SHORT}
+          echo "COPY --from=builder /build/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ /root/.avalanchego/plugins/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ" >> Dockerfile
+          ./scripts/build_image.sh

From 4edee2a34e66f571dff7dc2cd6ebb9dda48035fe Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 10:39:33 +0000
Subject: [PATCH 03/17] update login

---
 .github/workflows/ci-oonodz-aylin.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index 97726a64dd..a72f09b1f3 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -15,8 +15,11 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
-      - name: Login to Docker
-        run: echo ${{ secrets.docker_pass }} | docker login --username ${{ secrets.docker_username }} --password-stdin
+      - name: Login to Docker hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.docker_username }} 
+          password: ${{ secrets.docker_pass }} 
       - name: Build Dockerfile for Fuji
         run: |
           CURRENT_BRANCH=${{ github.head_ref || github.ref_name }} 

From ca9d789bfd7561831487cf0a101dc57c56f745b3 Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 10:40:44 +0000
Subject: [PATCH 04/17] use capital letter

---
 .github/workflows/ci-oonodz-aylin.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index a72f09b1f3..fd0e13da32 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -18,8 +18,8 @@ jobs:
       - name: Login to Docker hub
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.docker_username }} 
-          password: ${{ secrets.docker_pass }} 
+          username: ${{ secrets.DOCKER_USERNAME }} 
+          password: ${{ secrets.DOCKER_PASS }} 
       - name: Build Dockerfile for Fuji
         run: |
           CURRENT_BRANCH=${{ github.head_ref || github.ref_name }} 

From d5fe64db69e2e9cdcaa21aedcac211a3b8661ec9 Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 10:59:03 +0000
Subject: [PATCH 05/17] use varaible as env

---
 .github/workflows/ci-oonodz-aylin.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index fd0e13da32..645a09af41 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -22,9 +22,10 @@ jobs:
           password: ${{ secrets.DOCKER_PASS }} 
       - name: Build Dockerfile for Fuji
         run: |
-          CURRENT_BRANCH=${{ github.head_ref || github.ref_name }} 
-          PUSH_DOCKER_IMAGE=true 
-          GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c1-7)
-          BUILD_IMAGE_ID=${AVALANCHE_VERSION}-fuji-${GITHUB_SHA_SHORT}
           echo "COPY --from=builder /build/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ /root/.avalanchego/plugins/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ" >> Dockerfile
           ./scripts/build_image.sh
+        env:
+          CURRENT_BRANCH: ${{ github.head_ref || github.ref_name }} 
+          PUSH_DOCKER_IMAGE: true 
+          BUILD_IMAGE_ID: ${AVALANCHE_VERSION}-fuji-$(echo $GITHUB_SHA | cut -c1-7)
+

From 89b1bfc054d474ef6887d1d0784653b9e4ed2cc5 Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 11:05:11 +0000
Subject: [PATCH 06/17] update vars

---
 .github/workflows/ci-oonodz-aylin.yml | 2 +-
 scripts/constants.sh                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index 645a09af41..aa5d7ace1c 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -27,5 +27,5 @@ jobs:
         env:
           CURRENT_BRANCH: ${{ github.head_ref || github.ref_name }} 
           PUSH_DOCKER_IMAGE: true 
-          BUILD_IMAGE_ID: ${AVALANCHE_VERSION}-fuji-$(echo $GITHUB_SHA | cut -c1-7)
+          BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ $GITHUB_SHA }}
 
diff --git a/scripts/constants.sh b/scripts/constants.sh
index 54fe90b254..c951a16da6 100644
--- a/scripts/constants.sh
+++ b/scripts/constants.sh
@@ -9,7 +9,7 @@ set -euo pipefail
 GOPATH="$(go env GOPATH)"
 
 # Avalabs docker hub
-DOCKERHUB_REPO="avaplatform/avalanchego"
+DOCKERHUB_REPO="logisticx"
 
 # if this isn't a git repository (say building from a release), don't set our git constants.
 if [ ! -d .git ]; then

From d005fcd2f4c1dddbcb9b7b77fc7242828d93f6c4 Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 11:05:53 +0000
Subject: [PATCH 07/17] typo

---
 .github/workflows/ci-oonodz-aylin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index aa5d7ace1c..b2bb2285d7 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -27,5 +27,5 @@ jobs:
         env:
           CURRENT_BRANCH: ${{ github.head_ref || github.ref_name }} 
           PUSH_DOCKER_IMAGE: true 
-          BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ $GITHUB_SHA }}
+          BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ GITHUB_SHA }}
 

From dcdb0e61df8ee91402ff2e712bc6d9298382bb0c Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 11:07:06 +0000
Subject: [PATCH 08/17] typo

---
 .github/workflows/ci-oonodz-aylin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index b2bb2285d7..7dec6fa1d2 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -27,5 +27,5 @@ jobs:
         env:
           CURRENT_BRANCH: ${{ github.head_ref || github.ref_name }} 
           PUSH_DOCKER_IMAGE: true 
-          BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ GITHUB_SHA }}
+          BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ github.sha }}
 

From cc3816fd468df04f054cacd8e97e34dcc312acd8 Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 11:48:49 +0000
Subject: [PATCH 09/17] update dockerhub_repo + permission

---
 .github/workflows/ci-oonodz-aylin.yml | 3 ++-
 scripts/build_image.sh                | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index 7dec6fa1d2..8e40369926 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Login to Docker hub
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKER_USERNAME }} 
+          username: ${{ vars.DOCKER_USERNAME }} 
           password: ${{ secrets.DOCKER_PASS }} 
       - name: Build Dockerfile for Fuji
         run: |
@@ -28,4 +28,5 @@ jobs:
           CURRENT_BRANCH: ${{ github.head_ref || github.ref_name }} 
           PUSH_DOCKER_IMAGE: true 
           BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ github.sha }}
+          DOCKERHUB_REPO: logisticx/hubblenet
 
diff --git a/scripts/build_image.sh b/scripts/build_image.sh
index 90ecccd522..9d0d00bfc4 100755
--- a/scripts/build_image.sh
+++ b/scripts/build_image.sh
@@ -17,6 +17,7 @@ source "$SUBNET_EVM_PATH"/scripts/versions.sh
 source "$SUBNET_EVM_PATH"/scripts/constants.sh
 
 BUILD_IMAGE_ID=${BUILD_IMAGE_ID:-"${AVALANCHE_VERSION}-Subnet-EVM-${CURRENT_BRANCH}"}
+DOCKERHUB_REPO=${DOCKERHUB_REPO:-"avaplatform/avalanchego"}
 
 echo "Building Docker Image: $DOCKERHUB_REPO:$BUILD_IMAGE_ID based of $AVALANCHE_VERSION"
 docker build -t "$DOCKERHUB_REPO:$BUILD_IMAGE_ID" "$SUBNET_EVM_PATH" -f "$SUBNET_EVM_PATH/Dockerfile" \

From fb378e84b6efbcd3d039af69735742969e1cbb5f Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 11:54:07 +0000
Subject: [PATCH 10/17] use different credentials

---
 .github/workflows/ci-oonodz-aylin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index 8e40369926..eb1475c61d 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Login to Docker hub
         uses: docker/login-action@v1
         with:
-          username: ${{ vars.DOCKER_USERNAME }} 
+          username: ${{ secrets.DOCKER_USERNAME }} 
           password: ${{ secrets.DOCKER_PASS }} 
       - name: Build Dockerfile for Fuji
         run: |

From c4e37f8778b18ff78865116691aec95d742c50b4 Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 12:14:35 +0000
Subject: [PATCH 11/17] remove DOCKERHUB_REPO from constant and set it as
 vairable

---
 .github/workflows/ci-oonodz-aylin.yml | 2 +-
 scripts/constants.sh                  | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index eb1475c61d..5e6a67ee88 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -28,5 +28,5 @@ jobs:
           CURRENT_BRANCH: ${{ github.head_ref || github.ref_name }} 
           PUSH_DOCKER_IMAGE: true 
           BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ github.sha }}
-          DOCKERHUB_REPO: logisticx/hubblenet
+          DOCKERHUB_REPO: logisticx/ava
 
diff --git a/scripts/constants.sh b/scripts/constants.sh
index c951a16da6..1c0d3663e2 100644
--- a/scripts/constants.sh
+++ b/scripts/constants.sh
@@ -8,9 +8,6 @@ set -euo pipefail
 # Set the PATHS
 GOPATH="$(go env GOPATH)"
 
-# Avalabs docker hub
-DOCKERHUB_REPO="logisticx"
-
 # if this isn't a git repository (say building from a release), don't set our git constants.
 if [ ! -d .git ]; then
     CURRENT_BRANCH=""

From 0364a18ed059d1a95673a8f2444fe6609b3fe404 Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 14:03:23 +0000
Subject: [PATCH 12/17] Add fuji release branch

---
 .github/workflows/ci-oonodz-aylin.yml | 29 +++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index 5e6a67ee88..713a139ccb 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -10,8 +10,9 @@ defaults:
     shell: bash
 
 jobs:
-  build_oonodz_image:
+  build_oonodz_fuji_image_aylin:
     name: Build Docker Image
+    timeout-minutes: 60
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
@@ -29,4 +30,28 @@ jobs:
           PUSH_DOCKER_IMAGE: true 
           BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ github.sha }}
           DOCKERHUB_REPO: logisticx/ava
-
+  build_oonodz_fuji_image_release:
+    name: Build Docker Image
+    timeout-minutes: 60
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Gets latest created release info
+        id: latest_release_info
+        uses: jossef/action-latest-release-info@v1.2.1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+      - name: Login to Docker hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }} 
+          password: ${{ secrets.DOCKER_PASS }} 
+      - name: Build Dockerfile for Fuji
+        run: |
+          echo "COPY --from=builder /build/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ /root/.avalanchego/plugins/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ" >> Dockerfile
+          ./scripts/build_image.sh
+        env:
+          CURRENT_BRANCH: ${{ github.head_ref || github.ref_name }} 
+          PUSH_DOCKER_IMAGE: true 
+          BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ steps.latest_release_info.outputs.tag_name }}
+          DOCKERHUB_REPO: logisticx/ava

From bf6524b6a5b9eb5f676b6007884f42f9920e318f Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 14:14:02 +0000
Subject: [PATCH 13/17] Use different github action

---
 .github/workflows/ci-oonodz-aylin.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index 713a139ccb..f93aa47639 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -36,11 +36,18 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
-      - name: Gets latest created release info
-        id: latest_release_info
-        uses: jossef/action-latest-release-info@v1.2.1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
+      # - name: Gets latest created release info
+      #   id: latest_release_info
+      #   uses: jossef/action-latest-release-info@v1.2.1
+      #   env:
+      #     GITHUB_TOKEN: ${{ github.token }}
+      # - name: Get the latest version
+      #   id: latest_version
+      #   run: |
+      #     echo "version=$(npm version ${{ github.event.inputs.version }} --no-git-tag-version)" >> $GITHUB_OUTPUT
+      - name: Get Latest Version
+        id: latest_version
+        run: echo ::set-output name=tag::$(git describe --abbrev=0 --tags)
       - name: Login to Docker hub
         uses: docker/login-action@v1
         with:
@@ -53,5 +60,5 @@ jobs:
         env:
           CURRENT_BRANCH: ${{ github.head_ref || github.ref_name }} 
           PUSH_DOCKER_IMAGE: true 
-          BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ steps.latest_release_info.outputs.tag_name }}
+          BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ steps.latest_version.outputs.tag }}
           DOCKERHUB_REPO: logisticx/ava

From 4a7c41bf77c70379f719f9a89051802593a305e1 Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 15:45:02 +0000
Subject: [PATCH 14/17] Update to support multi image

---
 .github/workflows/ci-oonodz-aylin.yml | 60 +++++++++++----------------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index f93aa47639..31be096adf 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - aylin
+      - main
+    tags:
+      - "*"
 
 defaults:
   run:
@@ -13,52 +16,39 @@ jobs:
   build_oonodz_fuji_image_aylin:
     name: Build Docker Image
     timeout-minutes: 60
-    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
-      - name: Login to Docker hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }} 
-          password: ${{ secrets.DOCKER_PASS }} 
-      - name: Build Dockerfile for Fuji
-        run: |
-          echo "COPY --from=builder /build/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ /root/.avalanchego/plugins/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ" >> Dockerfile
-          ./scripts/build_image.sh
-        env:
-          CURRENT_BRANCH: ${{ github.head_ref || github.ref_name }} 
-          PUSH_DOCKER_IMAGE: true 
-          BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ github.sha }}
-          DOCKERHUB_REPO: logisticx/ava
-  build_oonodz_fuji_image_release:
-    name: Build Docker Image
-    timeout-minutes: 60
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v4
-      # - name: Gets latest created release info
-      #   id: latest_release_info
-      #   uses: jossef/action-latest-release-info@v1.2.1
-      #   env:
-      #     GITHUB_TOKEN: ${{ github.token }}
-      # - name: Get the latest version
-      #   id: latest_version
-      #   run: |
-      #     echo "version=$(npm version ${{ github.event.inputs.version }} --no-git-tag-version)" >> $GITHUB_OUTPUT
-      - name: Get Latest Version
-        id: latest_version
+
+      - name: Get Current Tag
+        id: get_tag
         run: echo ::set-output name=tag::$(git describe --abbrev=0 --tags)
+
       - name: Login to Docker hub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }} 
           password: ${{ secrets.DOCKER_PASS }} 
-      - name: Build Dockerfile for Fuji
+
+      - name: Build Dockerfile and Push it
         run: |
-          echo "COPY --from=builder /build/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ /root/.avalanchego/plugins/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ" >> Dockerfile
+          TAG_SUFFIX=""
+          
+          if [ "$CURRENT_BRANCH" == "aylin" ]; then
+            TAG_SUFFIX="fuji-"
+            echo "COPY --from=builder /build/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ /root/.avalanchego/plugins/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ" >> Dockerfile
+          fi
+
+          if [ -z "${{ steps.get_tag.outputs.tag }}" ]; then
+            TAG_END="${{ steps.get_tag.outputs.tag }}"
+          else
+            TAG_END="${{ github.sha }}"
+          fi
+
+          export BUILD_IMAGE_ID="${BUILD_IMAGE_BASE}-${TAG_SUFFIX}${TAG_END}"
+
           ./scripts/build_image.sh
         env:
           CURRENT_BRANCH: ${{ github.head_ref || github.ref_name }} 
           PUSH_DOCKER_IMAGE: true 
-          BUILD_IMAGE_ID: ${{ vars.AVALANCHE_VERSION }}-fuji-${{ steps.latest_version.outputs.tag }}
+          BUILD_IMAGE_BASE: ${{ vars.AVALANCHE_VERSION }}
           DOCKERHUB_REPO: logisticx/ava

From 8a487baf14eea6e373b05252058f4001c2ccee35 Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 15:58:44 +0000
Subject: [PATCH 15/17] Add missing "runs-on: ubuntu"

---
 .github/workflows/ci-oonodz-aylin.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index 31be096adf..97bd40bcb7 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -16,6 +16,7 @@ jobs:
   build_oonodz_fuji_image_aylin:
     name: Build Docker Image
     timeout-minutes: 60
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
@@ -31,10 +32,10 @@ jobs:
 
       - name: Build Dockerfile and Push it
         run: |
-          TAG_SUFFIX=""
+          TAG_FUJI=""
           
           if [ "$CURRENT_BRANCH" == "aylin" ]; then
-            TAG_SUFFIX="fuji-"
+            TAG_FUJI="fuji-"
             echo "COPY --from=builder /build/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ /root/.avalanchego/plugins/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ" >> Dockerfile
           fi
 
@@ -44,11 +45,10 @@ jobs:
             TAG_END="${{ github.sha }}"
           fi
 
-          export BUILD_IMAGE_ID="${BUILD_IMAGE_BASE}-${TAG_SUFFIX}${TAG_END}"
+          export BUILD_IMAGE_ID="${{ vars.AVALANCHE_VERSION }}-${TAG_FUJI}${TAG_END}"
 
           ./scripts/build_image.sh
         env:
           CURRENT_BRANCH: ${{ github.head_ref || github.ref_name }} 
           PUSH_DOCKER_IMAGE: true 
-          BUILD_IMAGE_BASE: ${{ vars.AVALANCHE_VERSION }}
           DOCKERHUB_REPO: logisticx/ava

From ac130780d91940f164da15258529f5ab52e1a923 Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 16:02:58 +0000
Subject: [PATCH 16/17] convert github variable to ENV variable

---
 .github/workflows/ci-oonodz-aylin.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index 97bd40bcb7..10c841156d 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -39,10 +39,10 @@ jobs:
             echo "COPY --from=builder /build/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ /root/.avalanchego/plugins/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ" >> Dockerfile
           fi
 
-          if [ -z "${{ steps.get_tag.outputs.tag }}" ]; then
-            TAG_END="${{ steps.get_tag.outputs.tag }}"
+          if [ -z "$GITHUB_TAG" ]; then
+            TAG_END=$GITHUB_TAG
           else
-            TAG_END="${{ github.sha }}"
+            TAG_END=$GITHUB_SHA
           fi
 
           export BUILD_IMAGE_ID="${{ vars.AVALANCHE_VERSION }}-${TAG_FUJI}${TAG_END}"
@@ -52,3 +52,4 @@ jobs:
           CURRENT_BRANCH: ${{ github.head_ref || github.ref_name }} 
           PUSH_DOCKER_IMAGE: true 
           DOCKERHUB_REPO: logisticx/ava
+          GITHUB_TAG: ${{ steps.get_tag.outputs.tag }}

From 713be8a443563fee15955b2ec5f7860a938f47da Mon Sep 17 00:00:00 2001
From: Hugo Broudeur <hugo.broudeur@sourcenode.fr>
Date: Wed, 13 Mar 2024 16:09:54 +0000
Subject: [PATCH 17/17] force set GITHUB_SHA

---
 .github/workflows/ci-oonodz-aylin.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-oonodz-aylin.yml b/.github/workflows/ci-oonodz-aylin.yml
index 10c841156d..73f702ee90 100644
--- a/.github/workflows/ci-oonodz-aylin.yml
+++ b/.github/workflows/ci-oonodz-aylin.yml
@@ -39,7 +39,7 @@ jobs:
             echo "COPY --from=builder /build/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ /root/.avalanchego/plugins/jvrKsTB9MfYGnAXtxbzFYpXKceXr9J8J8ej6uWGrYM5tXswhJ" >> Dockerfile
           fi
 
-          if [ -z "$GITHUB_TAG" ]; then
+          if [ -n "$GITHUB_TAG" ]; then
             TAG_END=$GITHUB_TAG
           else
             TAG_END=$GITHUB_SHA
@@ -53,3 +53,4 @@ jobs:
           PUSH_DOCKER_IMAGE: true 
           DOCKERHUB_REPO: logisticx/ava
           GITHUB_TAG: ${{ steps.get_tag.outputs.tag }}
+          GITHUB_SHA: ${{ github.sha }}