From f715e360e4dd4f6f36dcaa84e933471823582f13 Mon Sep 17 00:00:00 2001
From: Bret Fisher <bret@bretfisher.com>
Date: Mon, 26 Apr 2021 14:20:15 -0500
Subject: [PATCH] adding GHCR and arm/v7 builds

---
 .github/workflows/docker-build-and-push.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
index 5cc50b2..a736754 100644
--- a/.github/workflows/docker-build-and-push.yml
+++ b/.github/workflows/docker-build-and-push.yml
@@ -21,7 +21,7 @@ jobs:
           # list of Docker images to use as base name for tags
           images: |
             bretfisher/shpod
-          # ghcr.io/bretfisher/shpod
+            ghcr.io/bretfisher/shpod
           # add git short SHA as Docker tag
           tag-sha: true
       -
@@ -38,18 +38,18 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-      #   name: Login to GHCR
-      #   if: github.event_name != 'pull_request'
-      #   uses: docker/login-action@v1
-      #   with:
-      #     registry: ghcr.io
-      #     username: ${{ secrets.GHCR_USERNAME }}
-      #     password: ${{ secrets.GHCR_TOKEN }}
-      # -
+        name: Login to GHCR
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }},bretfisher/shpod:latest
           labels: ${{ steps.docker_meta.outputs.labels }}
\ No newline at end of file