Revert to build-push-actions v2 again

Author: tleguijt

.github/workflows/docker-image.yml

@@ -3,9 +3,6 @@ name: Publish Docker image
 on:
   release:
     types: [published]
-  push:
-    tags:
-      - 0.*
 
 jobs:
   build_and_deploy:
@@ -15,7 +12,7 @@ jobs:
       - name: Prepare
         id: prep
         run: |
-          DOCKER_IMAGE=mach
+          DOCKER_IMAGE=docker.pkg.github.com/labd/mach-composer/mach
           VERSION=noop
           if [[ $GITHUB_REF == refs/tags/* ]]; then
           VERSION=${GITHUB_REF#refs/tags/}
@@ -25,13 +22,13 @@ jobs:
               VERSION=edge
           fi
           fi
-          TAGS="${VERSION}"
+          TAGS="${DOCKER_IMAGE}:${VERSION}"
           if [[ $VERSION =~ ^(v)?[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
           MINOR=${VERSION%.*}
           MAJOR=${MINOR%.*}
-          TAGS="$TAGS,${MINOR},${MAJOR},latest"
+          TAGS="$TAGS,${DOCKER_IMAGE}:${MINOR},${DOCKER_IMAGE}:${MAJOR},${DOCKER_IMAGE}:latest"
           elif [ "${{ github.event_name }}" = "push" ]; then
-          TAGS="$TAGS,sha-${GITHUB_SHA::8}"
+          TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}"
           fi
           echo ::set-output name=version::${VERSION}
           echo ::set-output name=tags::${TAGS}
@@ -49,27 +46,19 @@ jobs:
 
       - name: Check out the repo
         uses: actions/checkout@v2
-      # - name: Login to GitHub packages
-      #   uses: docker/login-action@v1
-      #   with:
-      #     registry: docker.pkg.github.com
-      #     username: ${{ github.repository_owner }}
-      #     password: ${{ secrets.GITHUB_TOKEN }}
-      #     logout: false
-      # - name: Push to GitHub Packages
-      #   uses: docker/build-push-action@v2
-      #   with:
-      #     context: .
-      #     file: ./Dockerfile
-      #     cache-from: type=local,src=/tmp/.buildx-cache
-      #     cache-to: type=local,dest=/tmp/.buildx-cache
-      #     tags: ${{ steps.prep.outputs.tags }}
-      #     push: true
-      - name: Push to GitHub Packages
-        uses: docker/build-push-action@v1
+      - name: Login to GitHub packages
+        uses: docker/login-action@v1
         with:
+          registry: docker.pkg.github.com
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-          registry: docker.pkg.github.com
-          repository: labd/mach-composer/mach
-          tags: ${{ steps.prep.outputs.tags }}
+          logout: false
+      - name: Push to GitHub Packages
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          tags: ${{ steps.prep.outputs.tags }}
+          push: true