From 54ea8a373a39ad46abda244e2bd065e258174b73 Mon Sep 17 00:00:00 2001
From: Kieran Eglin <kieran.eglin@gmail.com>
Date: Thu, 28 Mar 2024 22:40:50 -0700
Subject: [PATCH] Combined old and new GH actions for docker

---
 .github/workflows/build_and_push_docker.yml | 54 ---------------------
 .github/workflows/docker_release.yml        | 14 ++----
 2 files changed, 4 insertions(+), 64 deletions(-)
 delete mode 100644 .github/workflows/build_and_push_docker.yml

diff --git a/.github/workflows/build_and_push_docker.yml b/.github/workflows/build_and_push_docker.yml
deleted file mode 100644
index 6d64800..0000000
--- a/.github/workflows/build_and_push_docker.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: Build and Push Docker Image
-
-on:
-  workflow_dispatch:
-    inputs:
-      image_tag:
-        type: choice
-        description: 'Docker Image Tag'
-        required: true
-        default: 'dev'
-        options:
-          - 'dev'
-          - 'latest'
-      platforms:
-        type: choice
-        description: 'Build Platforms'
-        required: true
-        default: 'linux/amd64,linux/arm64'
-        options:
-          - 'linux/amd64,linux/arm64'
-          - 'linux/amd64'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          platforms: ${{ github.event.inputs.platforms }}
-          push: true
-          file: ./selfhosted.Dockerfile
-          tags: |
-            keglin/pinchflat:${{ github.event.inputs.image_tag }}
-            ghcr.io/${{ github.repository_owner }}/pinchflat:${{ github.event.inputs.image_tag }}
diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml
index 52062ce..aa7e377 100644
--- a/.github/workflows/docker_release.yml
+++ b/.github/workflows/docker_release.yml
@@ -38,6 +38,7 @@ jobs:
           images: |
             docker.io/keglin/pinchflat
             ghcr.io/${{ github.repository }}
+          # All non-release actions will be tagged as `dev` (ie: push, workflow_dispatch)
           tags: |
             type=semver,pattern={{version}},prefix=v
             type=semver,pattern={{major}}.{{minor}},prefix=v
@@ -65,21 +66,14 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Echo outputs
-        run: |
-          echo "${{ github.event_name }}"
-          echo "${{ steps.meta.outputs.tags }}"
-          echo "${{ steps.meta.outputs.labels }}"
-          echo "${{ github.event.inputs.platforms }}"
-          echo "${{ github.event.inputs.platforms || env.release_arch }}"
-          echo "${{ github.event_name == 'release' && env.release_arch || (github.event.inputs.platforms || env.dev_arch) }}"
-
       - name: Build and Push
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./selfhosted.Dockerfile
+          # If the event is a release, use the release_arch, otherwise use the
+          # platforms input if present, falling back to dev_arch
           platforms: ${{ github.event_name == 'release' && env.release_arch || (github.event.inputs.platforms || env.dev_arch) }}
-          push: false # TODO: Set to true once everything is proven to work
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}