From c765d7f459d550aab918205045ac02e537ddd1bb Mon Sep 17 00:00:00 2001
From: scflavell <flavelllogins@outlook.com>
Date: Wed, 15 Feb 2023 14:51:56 +0000
Subject: [PATCH 1/4] Push to ECR

---
 .github/workflows/release-image.yml | 8 ++++++++
 Makefile                            | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml
index 3baa57c..eeb0558 100644
--- a/.github/workflows/release-image.yml
+++ b/.github/workflows/release-image.yml
@@ -28,3 +28,11 @@ jobs:
         run: make docker-build
       - name: Push container image to dockerhub
         run: make docker-push
+      - name: Tag image with ECR URI
+        run: |
+          echo "NEW_IMAGE=${{ secrets.ECR_URI }}/init:${{ env.IMAGE_TAG }}" >> $GITHUB_ENV
+          make docker-tag
+      - name: Push container image to ECR
+        run: |
+          echo "IMAGE=${{ env.NEW_IMAGE }}" >> $GITHUB_ENV
+          make docker-push
diff --git a/Makefile b/Makefile
index f7b17a3..7d34b40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 IMAGE ?= storageos/init:test
+NEW_IMAGE ?= storageos/init:test
+
 GO_BUILD_CMD = go build -v
 GO_ENV = GOOS=linux CGO_ENABLED=0
 
@@ -27,6 +29,10 @@ docker-build:
 docker-push:
 	docker push ${IMAGE}
 
+# Tag image
+docker-tag:
+	docker tag ${IMAGE} ${NEW_IMAGE}
+
 # Run tests
 test: generate fmt vet
 	go test -v -race `go list -v ./...`

From 5a9feb85c15063bb4ef108b1bcf1dcf494d15c60 Mon Sep 17 00:00:00 2001
From: scflavell <flavelllogins@outlook.com>
Date: Thu, 16 Feb 2023 09:51:12 +0000
Subject: [PATCH 2/4] Move to self-hosted runner

---
 .github/workflows/release-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml
index eeb0558..b63ea38 100644
--- a/.github/workflows/release-image.yml
+++ b/.github/workflows/release-image.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   publish-image:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     name: Publish container image
     steps:
       - name: Checkout

From b483b98ce10829e851f7ea1dda2a6b484eb454d0 Mon Sep 17 00:00:00 2001
From: scflavell <flavelllogins@outlook.com>
Date: Thu, 16 Feb 2023 10:01:20 +0000
Subject: [PATCH 3/4] Move docker tag/push out of makefile

---
 .github/workflows/release-image.yml | 6 ++----
 Makefile                            | 4 ----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml
index b63ea38..2366f5f 100644
--- a/.github/workflows/release-image.yml
+++ b/.github/workflows/release-image.yml
@@ -31,8 +31,6 @@ jobs:
       - name: Tag image with ECR URI
         run: |
           echo "NEW_IMAGE=${{ secrets.ECR_URI }}/init:${{ env.IMAGE_TAG }}" >> $GITHUB_ENV
-          make docker-tag
+          docker tag ${{ env.IMAGE_TAG }} ${{ env.NEW_IMAGE }}
       - name: Push container image to ECR
-        run: |
-          echo "IMAGE=${{ env.NEW_IMAGE }}" >> $GITHUB_ENV
-          make docker-push
+        run:  docker push ${{ env.NEW_IMAGE }}
diff --git a/Makefile b/Makefile
index 7d34b40..7f310fa 100644
--- a/Makefile
+++ b/Makefile
@@ -29,10 +29,6 @@ docker-build:
 docker-push:
 	docker push ${IMAGE}
 
-# Tag image
-docker-tag:
-	docker tag ${IMAGE} ${NEW_IMAGE}
-
 # Run tests
 test: generate fmt vet
 	go test -v -race `go list -v ./...`

From 1752e18339ac8a0f3974562da28c16b2b5c5e366 Mon Sep 17 00:00:00 2001
From: scflavell <flavelllogins@outlook.com>
Date: Thu, 16 Feb 2023 10:02:03 +0000
Subject: [PATCH 4/4] Remove unused var from Makefile

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7f310fa..2bbe780 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 IMAGE ?= storageos/init:test
-NEW_IMAGE ?= storageos/init:test
 
 GO_BUILD_CMD = go build -v
 GO_ENV = GOOS=linux CGO_ENABLED=0