diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1096ab1..bb699bd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -42,20 +42,20 @@ jobs: runs-on: ubuntu-latest name: ${{ matrix.profile }} steps: - # # - uses: actions/checkout@v3 - # # - run: docker compose --profile ${{ matrix.profile }} build --progress plain - # - name: Login to Docker Hub - # uses: docker/login-action@v2 - # with: - # username: ${{secrets.DOCKERHUB_USERNAME}} - # password: ${{ secrets.DOCKERHUB_TOKEN }} + # - uses: actions/checkout@v3 + # - run: docker compose --profile ${{ matrix.profile }} build --progress plain + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{secrets.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: echo docker tag ${{matrix.dockertag}} ${{vars.DOCKERHUB_USERNAME}}/${{matrix.dockerhubtag}}:latest - - run: echo docker tag ${{matrix.dockertag}} ${{vars.DOCKERHUB_USERNAME}}/${{matrix.dockerhubtag}}:${SHORT_SHA} - - run: echo 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: echo docker image push --all-tags ${{vars.DOCKERHUB_USERNAME}}/${{matrix.dockerhubtag}}