From 5b5dfbb3ff042e4a1121d5db64e5bbf508185b1b Mon Sep 17 00:00:00 2001
From: Ty Eggen <tycho.eggen@gmail.com>
Date: Tue, 25 Jun 2024 10:04:44 -0700
Subject: [PATCH] ci: refactored actions config

---
 .github/workflows/docker-build-only.yml | 25 --------------
 .github/workflows/docker-build-push.yml | 36 --------------------
 .github/workflows/docker-image.yml      | 45 +++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 61 deletions(-)
 delete mode 100644 .github/workflows/docker-build-only.yml
 delete mode 100644 .github/workflows/docker-build-push.yml
 create mode 100644 .github/workflows/docker-image.yml

diff --git a/.github/workflows/docker-build-only.yml b/.github/workflows/docker-build-only.yml
deleted file mode 100644
index 453ec51..0000000
--- a/.github/workflows/docker-build-only.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Docker Image CI (Build Only)
-
-on:
-    pull_request:
-        branches: ['main', 'master', 'trunk']
-
-jobs:
-    build-only:
-        runs-on: ubuntu-latest
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Docker metadata
-              id: meta
-              uses: docker/metadata-action@v5
-
-            - name: Build and push
-              uses: docker/build-push-action@v5
-              with:
-                  context: .
-                  push: false
-                  tags: ${{ steps.meta.outputs.tags }}
-                  labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
deleted file mode 100644
index 3d32e11..0000000
--- a/.github/workflows/docker-build-push.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Docker Image CI
-
-on:
-  push:
-    branches: ["main", "master", "trunk"]
-    tags: ["v*"]
-
-jobs:
-  build-push:
-    if: ${{ github.event_name != 'pull_request' }}
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ vars.DOCKERHUB_TEMPLATE }}
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}, ${{ vars.DOCKERHUB_TEMPLATE }}:latest
-          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
new file mode 100644
index 0000000..7f397dc
--- /dev/null
+++ b/.github/workflows/docker-image.yml
@@ -0,0 +1,45 @@
+name: Docker Image CI
+
+on:
+    push:
+        branches:
+            - 'main'
+            - 'master'
+            - 'trunk'
+        tags:
+            - 'v*'
+    pull_request:
+        branches:
+            - 'main'
+            - 'master'
+            - 'trunk'
+    workflow_dispatch:
+
+jobs:
+    docker:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Docker meta
+              id: meta
+              uses: docker/metadata-action@v5
+              with:
+                  images: ${{ vars.DOCKERHUB_TEMPLATE }}
+
+            - name: Login to DockerHub
+              if: github.event_name != 'pull_request'
+              uses: docker/login-action@v3
+              with:
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+            - name: Build and push
+              uses: docker/build-push-action@v5
+              with:
+                  context: .
+                  push: ${{ github.event_name != 'pull_request' }}
+                  tags: ${{ steps.meta.outputs.tags }}, ${{ vars.DOCKERHUB_TEMPLATE }}:latest
+                  labels: ${{ steps.meta.outputs.labels }}