From 1b042ee4caec41798810f97ad2c8f91a366eba2b Mon Sep 17 00:00:00 2001
From: daozhao chen <daozhao@163.com>
Date: Fri, 28 Apr 2023 07:38:32 +0000
Subject: [PATCH] 41

---
 .github/workflows/docker.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8c4b6ff..eb93400 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -47,22 +47,18 @@ jobs:
       - uses: actions/checkout@v3
       - run: docker compose --profile ${{ matrix.profile }} build --progress plain
 
-    if:  ${{ vars.DOCKERHUB_USERNAME }} 
-    steps:
       - name: Login to Docker Hub and push images.
+        if:  ${{ vars.DOCKERHUB_USERNAME }} 
         uses: docker/login-action@v2
         with:
           username: ${{ vars.DOCKERHUB_USERNAME}}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       # - run: echo "docker build is ok." ${{matrix.profile}} ${{matrix.dockertag}} ${{matrix.dockerhubtag}}
       # - run: echo env ${{env.DOCKERHUB_USERNAME}}  vars ${{vars.DOCKERHUB_USERNAME}} 
-      - run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-7`" >> $GITHUB_ENV
-      # - run: echo ${SHORT_SHA}
-      # - run: docker image ls
-      - run: docker tag ${{matrix.dockertag}} ${{vars.DOCKERHUB_USERNAME}}/${{matrix.dockerhubtag}}:latest
-      - run: docker tag ${{matrix.dockertag}} ${{vars.DOCKERHUB_USERNAME}}/${{matrix.dockerhubtag}}:${SHORT_SHA}
-      # - run: docker image ls
-      - run: docker push --all-tags ${{vars.DOCKERHUB_USERNAME}}/${{matrix.dockerhubtag}}
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-7`" >> $GITHUB_ENV
+      # - run: docker tag ${{matrix.dockertag}} ${{vars.DOCKERHUB_USERNAME}}/${{matrix.dockerhubtag}}:latest
+      # - run: docker tag ${{matrix.dockertag}} ${{vars.DOCKERHUB_USERNAME}}/${{matrix.dockerhubtag}}:${SHORT_SHA}
+      # - run: docker push --all-tags ${{vars.DOCKERHUB_USERNAME}}/${{matrix.dockerhubtag}}