From d93ac5cde1c2286d39bb40d3c2a6c6650ab54640 Mon Sep 17 00:00:00 2001
From: "Adam C. Migus" <adam@migus.org>
Date: Tue, 1 Mar 2022 12:43:03 -0500
Subject: [PATCH] Reenable image publishing.

---
 .github/workflows/docker.yml | 2 +-
 .github/workflows/gpr.yml    | 2 +-
 .github/workflows/quay.yml   | 2 +-
 Makefile                     | 7 ++++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d6c448f..02904b8 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -36,5 +36,5 @@ jobs:
 
           registry=registry.hub.docker.com
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login $registry -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-          make image REGISTRY="$registry/${{ secrets.DOCKER_USERNAME }}" VERSION=$version
+          make release REGISTRY="$registry/${{ secrets.DOCKER_USERNAME }}" VERSION=$version
           docker logout
diff --git a/.github/workflows/gpr.yml b/.github/workflows/gpr.yml
index bca156f..7c27bc7 100644
--- a/.github/workflows/gpr.yml
+++ b/.github/workflows/gpr.yml
@@ -37,5 +37,5 @@ jobs:
 
           registry=docker.pkg.github.com
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
-          make image REGISTRY="$registry/${{ github.repository }}" VERSION=$version
+          make release REGISTRY="$registry/${{ github.repository }}" VERSION=$version
           docker logout
diff --git a/.github/workflows/quay.yml b/.github/workflows/quay.yml
index 2a1b710..60c76e0 100644
--- a/.github/workflows/quay.yml
+++ b/.github/workflows/quay.yml
@@ -36,5 +36,5 @@ jobs:
 
           registry=quay.io
           echo "${{ secrets.QUAY_PASSWORD }}" | docker login $registry -u ${{ secrets.QUAY_USERNAME }} --password-stdin
-          make image REGISTRY="$registry/${{ secrets.QUAY_USERNAME }}" VERSION=$version
+          make release REGISTRY="$registry/${{ secrets.QUAY_USERNAME }}" VERSION=$version
           docker logout
diff --git a/Makefile b/Makefile
index ec3ba6e..cd3845f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,12 @@ all: install
 
 # Build the dsv-injector service container image 📦
 image:
-	$(DOCKER) $(DOCKER_ARGS) build . -t $(NAME):$(VERSION) $(DOCKER_BUILD_ARGS)
+	$(DOCKER) $(DOCKER_ARGS) build . $(DOCKER_BUILD_ARGS) -t $(NAME):$(VERSION)
+
+# Publish the image to $(REGISTRY)
+release: image
+	$(DOCKER) $(DOCKER_ARGS) tag $(DOCKER_TAG_ARGS) $(NAME):$(VERSION) $(REGISTRY)/$(NAME):$(VERSION)
+	$(DOCKER) $(DOCKER_ARGS) push $(DOCKER_PUSH_ARGS) $(REGISTRY)/$(NAME):$(VERSION)
 
 # Install the Helm chart using a roles.json file 📄
 install: