From 28fcfe544c3ff196be7166f1f2c57d90dfaece7a Mon Sep 17 00:00:00 2001
From: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com>
Date: Fri, 6 Sep 2024 20:26:14 +0530
Subject: [PATCH] Update build-&-publish-docker-image.yml

---
 .../build-&-publish-docker-image.yml          | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-&-publish-docker-image.yml b/.github/workflows/build-&-publish-docker-image.yml
index 4c4382675..d31f5a6e7 100644
--- a/.github/workflows/build-&-publish-docker-image.yml
+++ b/.github/workflows/build-&-publish-docker-image.yml
@@ -56,10 +56,13 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+        run: |
+          mkdir -p /tmp/docker-config-${{ github.run_id }}
+          docker --config /tmp/docker-config-${{ github.run_id }} login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }}
+        # uses: docker/login-action@v1
+        # with:
+        #   username: ${{ secrets.DOCKERHUB_USERNAME }}
+        #   password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       # - name: Get changed files using defaults
       #   id: changed-files
@@ -96,6 +99,10 @@ jobs:
           docker tag ${BLOBBER_REGISTRY}:${TAG} ${BLOBBER_REGISTRY}:${TAG}-${SHORT_SHA}
           docker push ${BLOBBER_REGISTRY}:${TAG}-${SHORT_SHA}
 
+      - name: Clean up Docker Config
+        run: |
+          rm -rf /tmp/docker-config-${{ github.run_id }}
+
   validator:
     timeout-minutes: 30
     runs-on: [blobber-runner]
@@ -124,10 +131,13 @@ jobs:
       #     go-version: ^1.21 # The Go version to download (if necessary) and use.
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+        run: |
+          mkdir -p /tmp/docker-config-${{ github.run_id }}
+          docker --config /tmp/docker-config-${{ github.run_id }} login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }}
+        # uses: docker/login-action@v1
+        # with:
+        #   username: ${{ secrets.DOCKERHUB_USERNAME }}
+        #   password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: Clone blobber
         uses: actions/checkout@v3
@@ -173,6 +183,10 @@ jobs:
           docker tag ${VALIDATOR_REGISTRY}:${TAG} ${VALIDATOR_REGISTRY}:${TAG}-${SHORT_SHA}
           docker push ${VALIDATOR_REGISTRY}:${TAG}-${SHORT_SHA}
 
+      - name: Clean up Docker Config
+        run: |
+          rm -rf /tmp/docker-config-${{ github.run_id }}
+
   system-tests:
     if: github.event_name != 'workflow_dispatch'
     needs: [blobber, validator]