Building images using Buildkit for amd64 and arm64

Author: Roland Schilling

.github/workflows/main.yml

@@ -14,51 +14,38 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+      - name: setup qemu for multi-arch build
+        uses: docker/setup-qemu-action@v2
         with:
-          #registry: registry.hub.docker.com
-          username: wurstbrot
-          password: ${{ secrets.HUB_TOKEN }}
-      - name: create and push an image
+          platforms: amd64,arm64
+      - name: setup buildx
+        uses: docker/setup-buildx-action@v2
+      - name: create version string
+        id: version
         run: |
           if [ "${GITHUB_REF##*/}" == "master" ]; then
-            VERSION="3.0.0-${GITHUB_RUN_NUMBER}"
+            echo "VERSION=3.0.0-${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
           else
             BRANCH_TO_DOCKER=$(echo ${GITHUB_REF##*/} | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9._-]//g')
-            VERSION="${BRANCH_TO_DOCKER}-${GITHUB_RUN_NUMBER}"
+            echo "VERSION=${BRANCH_TO_DOCKER}-${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
           fi
-          docker build -t wurstbrot/dsomm-yaml-generation:latest -f Dockerfile-yaml .
-          docker push wurstbrot/dsomm-yaml-generation:latest
-          docker tag wurstbrot/dsomm-yaml-generation:latest wurstbrot/dsomm-yaml-generation:${VERSION}
-          docker push wurstbrot/dsomm-yaml-generation:${VERSION}
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
         with:
           #registry: registry.hub.docker.com
           username: wurstbrot
           password: ${{ secrets.HUB_TOKEN }}
-      - name: setup qemu for multi-arch build
-        uses: docker/setup-qemu-action@v1
-      - name: setup buildx
-        id: buildx
-        uses: docker/setup/buildx-action@v1
-      - name: create version string
-        id: version
-        run: |
-          if [ "${GITHUB_REF##*/}" == "master" ]; then
-            VERSION="3.0.0-${GITHUB_RUN_NUMBER}"
-          else
-            BRANCH_TO_DOCKER=$(echo ${GITHUB_REF##*/} | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9._-]//g')
-            VERSION="${BRANCH_TO_DOCKER}-${GITHUB_RUN_NUMBER}"
-          fi
-      - name: create and push an image
-        uses: docker/build-push-action@v2
+      - name: create and push yaml image
+        uses: docker/build-push-action@v3
+        with:
+          file: Dockerfile-yaml
+          push: false
+          platforms: linux/amd64,linux/arm64
+          tags: wurstbrot/dsomm-yaml-generation:${{ env.VERSION }},wurstbrot/dsomm-yaml-generation:latest
+      - name: create and push dsomm image
+        uses: docker/build-push-action@v3
         with:
-          context: .
-          push: true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          tags: 
-            - wurstbrot/dsomm:${VERSION}
-            - wurstbrot/dsomm:lastest
+          push: false
+          platforms: linux/amd64,linux/arm64
+          tags: wurstbrot/dsomm:${{ env.VERSION }},wurstbrot/dsomm:latest