From 353ce08546c3bc8fe641f503c0905e0a09ce3ac4 Mon Sep 17 00:00:00 2001
From: King'ori Maina <j@kingori.co>
Date: Wed, 16 Oct 2024 19:53:41 +0200
Subject: [PATCH] Combine push-image-ghcr/build-and-push-image job with
 release/docker-hub-release

---
 .github/workflows/push-image-ghcr.yml | 54 ---------------------------
 .github/workflows/release.yml         | 13 ++++++-
 2 files changed, 12 insertions(+), 55 deletions(-)
 delete mode 100644 .github/workflows/push-image-ghcr.yml

diff --git a/.github/workflows/push-image-ghcr.yml b/.github/workflows/push-image-ghcr.yml
deleted file mode 100644
index 5e60097..0000000
--- a/.github/workflows/push-image-ghcr.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: Create and publish a Docker image to ghcr.io
-
-on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build-and-push-image:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=sha,enable=true,priority=100,prefix=,suffix=,format=short
-            type=semver,pattern={{version}},value=${{ github.ref_name }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          provenance: false
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a5f60d1..af8a881 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,6 +26,9 @@ jobs:
     runs-on: ubuntu-latest
     env:
       IMAGE: danihodovic/celery-exporter
+    permissions:
+      contents: write
+      packages: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -33,7 +36,9 @@ jobs:
         id: metadata
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.IMAGE }}
+          images: |
+            ${{ env.IMAGE }}
+            ghcr.io/${{ env.IMAGE }}
       - name: Set Up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set Up Docker Buildx
@@ -43,6 +48,12 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      - name: Login to Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build, tag, and push image to Docker Hub
         uses: docker/build-push-action@v6
         with: