From 91bd042a8eac49b44581d0b961fb4388fce77fbc Mon Sep 17 00:00:00 2001
From: Chase <chase@blockstream.com>
Date: Wed, 3 Jun 2026 19:05:51 +0200
Subject: [PATCH] fix(ci): configure dockerhub login

---
 gitlab/build.yml | 13 +++++++++++++
 gitlab/test.yml  |  1 +
 2 files changed, 14 insertions(+)

diff --git a/gitlab/build.yml b/gitlab/build.yml
index 36d1382f..e62bf4e4 100644
--- a/gitlab/build.yml
+++ b/gitlab/build.yml
@@ -7,6 +7,7 @@
           - contrib/Dockerfile.base
         compare_to: master
   before_script:
+    - echo "$DOCKERHUB_PASSWORD" | docker login -u $DOCKERHUB_USER --password-stdin
     - docker buildx create
       --driver=docker-container
       --name=buildkit-builder
@@ -41,9 +42,14 @@ build_and_push_esplora_base:
         paths:
           - contrib/Dockerfile.base
         compare_to: master
+  variables:
+    # No source checkout needed; we only tag already-built images.
+    GIT_STRATEGY: none
   needs:
     - build_esplora_base_amd64
     - build_esplora_base_arm64
+  before_script:
+    - echo "$DOCKERHUB_PASSWORD" | docker login -u $DOCKERHUB_USER --password-stdin
   script:
     - docker buildx imagetools create
       -t ${IMAGE_BASE}:latest
@@ -58,6 +64,7 @@ build_and_push_esplora_base:
     - master
     - triggers
   before_script:
+    - echo "$DOCKERHUB_PASSWORD" | docker login -u $DOCKERHUB_USER --password-stdin
     - apk add --no-cache curl
     - docker buildx create
       --driver=docker-container
@@ -109,6 +116,7 @@ build_esplora_test_arm64:
   except:
     - triggers
   before_script:
+    - echo "$DOCKERHUB_PASSWORD" | docker login -u $DOCKERHUB_USER --password-stdin
     - apk add --no-cache curl
     - docker buildx create
       --driver=docker-container
@@ -145,9 +153,14 @@ build_and_push_esplora_latest:
     - master
   except:
     - triggers
+  variables:
+    # No source checkout needed; we only tag already-built images.
+    GIT_STRATEGY: none
   needs:
     - build_esplora_latest_amd64
     - build_esplora_latest_arm64
+  before_script:
+    - echo "$DOCKERHUB_PASSWORD" | docker login -u $DOCKERHUB_USER --password-stdin
   script:
     - docker buildx imagetools create
       -t ${IMAGE}:latest
diff --git a/gitlab/test.yml b/gitlab/test.yml
index 15e4cc4e..64c37c04 100644
--- a/gitlab/test.yml
+++ b/gitlab/test.yml
@@ -8,6 +8,7 @@
     # 2. The required variables from GitHub Actions are present.
     - if: '$CI_PIPELINE_SOURCE == "trigger" && $GITHUB_PR_SHA && $GH_STATUS_TOKEN && $GITHUB_REPO && $GITHUB_PR_REF && $GITHUB_REPO_URL'
   before_script:
+    - echo "$DOCKERHUB_PASSWORD" | docker login -u $DOCKERHUB_USER --password-stdin
     # Make sure curl and git are available
     - apk add --no-cache curl git
     # Report "pending" status to GitHub as soon as the job starts