change pushing to docker image repo

radio-t · Nov 23, 2024 · 563c2e0 · 563c2e0
1 parent 2879fbb
commit 563c2e0
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,17 +12,23 @@ jobs:
 
       - name: build and push master image
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        env:
+          DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
+          USERNAME: ${{ github.actor }}
         run: |
           docker build -t radiot/tg-retrans:master .
-          docker login --username ${{ secrets.DOCKERHUB_USER }} --password ${{ secrets.DOCKERHUB_PASSWD }}
+          echo ${DOCKER_HUB_TOKEN} | docker login -u ${USERNAME} --password-stdin
           docker push radiot/tg-retrans:master
 
       - name: build and push tagged image
         if: github.event_name == 'push' && github.event.ref_type == 'tag'
+        env:
+          DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
+          USERNAME: ${{ github.actor }}      
         run: |
           GIT_TAG="${GITHUB_REF#refs/tags/}"
           docker build -t radiot/tg-retrans:${GIT_TAG} .
-          docker login --username ${{ secrets.DOCKERHUB_USER }} --password ${{ secrets.DOCKERHUB_PASSWD }}
+          echo ${DOCKER_HUB_TOKEN} | docker login -u ${USERNAME} --password-stdin
           docker push radiot/tg-retrans:${GIT_TAG}
           docker tag radiot/tg-retrans:${GIT_TAG} radiot/tg-retrans:latest
           docker push radiot/tg-retrans:latest