From df85d04f89a499fa152b32ba9a62cec0e85181a3 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Tue, 18 Feb 2025 13:24:32 +0000
Subject: [PATCH 1/5] fix dockerhub login

---
 .github/workflows/ci3.yml | 3 +++
 ci3/bootstrap_ec2         | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/.github/workflows/ci3.yml b/.github/workflows/ci3.yml
index aa22c7aa747f..90a165fe8389 100644
--- a/.github/workflows/ci3.yml
+++ b/.github/workflows/ci3.yml
@@ -66,6 +66,8 @@ jobs:
           LOG_ID: ${{ github.run_id }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
         run: |
           ./ci.sh ec2
       - name: Download benchmarks
@@ -153,6 +155,7 @@ jobs:
           ARCH: arm64
           LOG_ID: ${{ github.run_id }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
         run: |
           ./ci.sh ec2
 
diff --git a/ci3/bootstrap_ec2 b/ci3/bootstrap_ec2
index 7e2aa3751266..36b4ca988718 100755
--- a/ci3/bootstrap_ec2
+++ b/ci3/bootstrap_ec2
@@ -100,6 +100,10 @@ container_script=$(cat <<EOF
   git checkout -b $REF_NAME
   export CI_FULL=$CI_FULL
   source ci3/source
+
+  if [ -n "${DOCKERHUB_PASSWORD:-}"]; then
+    echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
+  fi
   echo "env: REF_NAME=$REF_NAME COMMIT_HASH=$COMMIT_HASH CURRENT_VERSION=$CURRENT_VERSION CI_FULL=$CI_FULL"
   if semver check "$REF_NAME"; then
     echo "Performing a release because $REF_NAME is a semver."

From 43f2452e4be216446f1e0af13dc7f45cc1f3c94e Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Tue, 18 Feb 2025 13:25:17 +0000
Subject: [PATCH 2/5] inject dockerhub creds

---
 ci3/bootstrap_ec2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci3/bootstrap_ec2 b/ci3/bootstrap_ec2
index 36b4ca988718..6589dc43b48a 100755
--- a/ci3/bootstrap_ec2
+++ b/ci3/bootstrap_ec2
@@ -101,7 +101,7 @@ container_script=$(cat <<EOF
   export CI_FULL=$CI_FULL
   source ci3/source
 
-  if [ -n "${DOCKERHUB_PASSWORD:-}"]; then
+  if [ -n "${DOCKERHUB_PASSWORD:-}" ] && [ "$REF_NAME" == "master" ] ; then
     echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
   fi
   echo "env: REF_NAME=$REF_NAME COMMIT_HASH=$COMMIT_HASH CURRENT_VERSION=$CURRENT_VERSION CI_FULL=$CI_FULL"

From f8039c34b76386826d86047695245480f07ef826 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Tue, 18 Feb 2025 08:26:05 -0500
Subject: [PATCH 3/5] Update ci3.yml

---
 .github/workflows/ci3.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci3.yml b/.github/workflows/ci3.yml
index 90a165fe8389..3ae684fc8a49 100644
--- a/.github/workflows/ci3.yml
+++ b/.github/workflows/ci3.yml
@@ -67,7 +67,6 @@ jobs:
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-          echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
         run: |
           ./ci.sh ec2
       - name: Download benchmarks

From bd0c2c3782df5535b30da580518354b33bd56985 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Tue, 18 Feb 2025 08:27:38 -0500
Subject: [PATCH 4/5] Update bootstrap_ec2

---
 ci3/bootstrap_ec2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci3/bootstrap_ec2 b/ci3/bootstrap_ec2
index 6589dc43b48a..6800b50e9c0d 100755
--- a/ci3/bootstrap_ec2
+++ b/ci3/bootstrap_ec2
@@ -101,7 +101,7 @@ container_script=$(cat <<EOF
   export CI_FULL=$CI_FULL
   source ci3/source
 
-  if [ -n "${DOCKERHUB_PASSWORD:-}" ] && [ "$REF_NAME" == "master" ] ; then
+  if [ -n "${DOCKERHUB_PASSWORD:-}" ] && ([ "$REF_NAME" == "master" ] || semver check "$REF_NAME"); then
     echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
   fi
   echo "env: REF_NAME=$REF_NAME COMMIT_HASH=$COMMIT_HASH CURRENT_VERSION=$CURRENT_VERSION CI_FULL=$CI_FULL"

From edd0f6c24cbf14d96ca5d22221c90f6b5a2737fb Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Tue, 18 Feb 2025 13:30:28 +0000
Subject: [PATCH 5/5] fix

---
 ci3/bootstrap_ec2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci3/bootstrap_ec2 b/ci3/bootstrap_ec2
index 6800b50e9c0d..4ce20cef9dcc 100755
--- a/ci3/bootstrap_ec2
+++ b/ci3/bootstrap_ec2
@@ -102,7 +102,7 @@ container_script=$(cat <<EOF
   source ci3/source
 
   if [ -n "${DOCKERHUB_PASSWORD:-}" ] && ([ "$REF_NAME" == "master" ] || semver check "$REF_NAME"); then
-    echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
+    echo $DOCKERHUB_PASSWORD | docker login -u aztecprotocolci --password-stdin
   fi
   echo "env: REF_NAME=$REF_NAME COMMIT_HASH=$COMMIT_HASH CURRENT_VERSION=$CURRENT_VERSION CI_FULL=$CI_FULL"
   if semver check "$REF_NAME"; then