From cd27be290c64252bd191f3f42242ca6e33a8ffba Mon Sep 17 00:00:00 2001
From: Matthew Penner <me@matthewp.io>
Date: Tue, 15 Dec 2020 10:10:17 -0700
Subject: [PATCH] Attempt to fix build failures

---
 .github/workflows/docker-publish.yml | 34 +++++++++-------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 74b2311..50f1afe 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -42,31 +42,19 @@ jobs:
           version: v0.5.1
           buildkitd-flags: --debug
 
-#      - name: Registry Authentication
-#        run: |
-#          echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
 
-#      - name: Build Image
-#        env:
-#          IMAGE_ID: docker.pkg.github.com/${{ github.repository }}/${{ matrix.image }}:latest
-#        run: |
-#          docker buildx build --push --platform=linux/amd64 --tag=$IMAGE_ID ./${{ matrix.image }}
-
-      - name: Set up containerd
-        uses: crazy-max/ghaction-setup-containerd@v1
-
-      - name: Build Docker image
+      - name: Build
         uses: docker/build-push-action@v2
         with:
           context: ./alpine
-          file: ./alpine/Dockerfile
-          platforms: linux/amd64
-          tags: docker.pkg.github.com/${{ github.repository }}/${{ matrix.image }}:latest
-          outputs: type=oci,dest=/tmp/image.tar
+          tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}:latest
+          load: true
 
-      - name: Import image in containerd
-        run: |
-          sudo ctr i import --base-name docker.io/user/app --digests --all-platforms /tmp/image.tar
-      - name: Push image with containerd
-        run: |
-          sudo ctr --debug i push --user "${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}" docker.pkg.github.com/${{ github.repository }}/${{ matrix.image }}:latest
+      - name: Push
+        run: docker push ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}:latest