Reinstate dockerhub login for build steps

Consensys · Oct 18, 2024 · 5f37523 · 5f37523
1 parent 7f3843a
commit 5f37523
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 32 deletions.
diff --git a/.github/workflows/coordinator-build-and-publish.yml b/.github/workflows/coordinator-build-and-publish.yml
@@ -18,9 +18,9 @@ on:
         default: false
     secrets:
       DOCKERHUB_USERNAME:
-        required: false
+        required: true
       DOCKERHUB_TOKEN:
-        required: false
+        required: true
   workflow_dispatch:
     inputs:
       push_image:
@@ -59,6 +59,11 @@ jobs:
       - name: Build dist
         run: |
           ./gradlew coordinator:app:distZip --no-daemon
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx - local
@@ -91,12 +96,6 @@ jobs:
         with:
           name: linea-coordinator
           path: linea-coordinator-docker-image.tar.gz
-      - name: Login to Docker Hub
-        if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build & push
         uses: docker/build-push-action@v6
         if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}

diff --git a/.github/workflows/postman-build-and-publish.yml b/.github/workflows/postman-build-and-publish.yml
@@ -18,9 +18,9 @@ on:
         default: false
     secrets:
       DOCKERHUB_USERNAME:
-        required: false
+        required: true
       DOCKERHUB_TOKEN:
-        required: false
+        required: true
   workflow_dispatch:
     inputs:
       push_image:
@@ -54,6 +54,11 @@ jobs:
           ssh-key: ${{ secrets.SELF_GITHUB_SSH_KEY }}
           submodules: true
           persist-credentials: false
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
@@ -87,12 +92,6 @@ jobs:
         with:
           name: linea-postman
           path: linea-postman-docker-image.tar.gz
-      - name: Login to Docker Hub
-        if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push postman image
         uses: docker/build-push-action@v6
         if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}

diff --git a/.github/workflows/prover-build-and-publish.yml b/.github/workflows/prover-build-and-publish.yml
@@ -18,9 +18,9 @@ on:
         default: false
     secrets:
       DOCKERHUB_USERNAME:
-        required: false
+        required: true
       DOCKERHUB_TOKEN:
-        required: false
+        required: true
   workflow_dispatch:
     inputs:
       push_image:
@@ -57,6 +57,11 @@ jobs:
           ssh-key: ${{ secrets.SELF_GITHUB_SSH_KEY }}
           submodules: true
           persist-credentials: false
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Show the "version" build argument
@@ -90,12 +95,6 @@ jobs:
         with:
           name: linea-prover
           path: linea-prover-docker-image.tar.gz
-      - name: Login to Docker Hub
-        if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push prover image
         uses: docker/build-push-action@v6
         if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}

diff --git a/.github/workflows/traces-api-facade-build-and-publish.yml b/.github/workflows/traces-api-facade-build-and-publish.yml
@@ -18,9 +18,9 @@ on:
         default: false
     secrets:
       DOCKERHUB_USERNAME:
-        required: false
+        required: true
       DOCKERHUB_TOKEN:
-        required: false
+        required: true
   workflow_dispatch:
     inputs:
       push_image:
@@ -63,6 +63,11 @@ jobs:
         run: |
           ./gradlew traces-api-facade:app:shadowJar
           echo ${{ github.workspace }}
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -95,12 +100,6 @@ jobs:
         with:
           name: linea-traces-api-facade
           path: linea-traces-api-facade-docker-image.tar.gz
-      - name: Login to Docker Hub
-        if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build & push
         uses: docker/build-push-action@v6
         if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}