From 4cf5b8933ab88122c647b0427e3d29dc73b8e6f4 Mon Sep 17 00:00:00 2001
From: Nicko Guyer <nicko.guyer@kaleido.io>
Date: Tue, 8 Feb 2022 11:09:05 -0500
Subject: [PATCH 1/2] Pass arguments from Makefile to docker build script

Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
---
 .github/workflows/docker_main.yml    |  5 +++--
 .github/workflows/docker_release.yml | 11 +++--------
 Makefile                             |  2 +-
 docker_build.sh                      |  2 ++
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml
index f3d75c3dc5..7b97f861e3 100644
--- a/.github/workflows/docker_main.yml
+++ b/.github/workflows/docker_main.yml
@@ -22,11 +22,12 @@ jobs:
 
       - name: Build
         run: |
-          docker build \
+          make ARGS='\
             --label commit=$GITHUB_SHA \
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
-            --tag ghcr.io/hyperledger/firefly:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
+            --tag ghcr.io/hyperledger/firefly:${{ steps.build_tag_generator.outputs.BUILD_TAG }}' \
+            docker
 
       - name: Tag release
         run: docker tag ghcr.io/hyperledger/firefly:${{ steps.build_tag_generator.outputs.BUILD_TAG }} ghcr.io/hyperledger/firefly:head
diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml
index d03b96c670..29d1dbb58f 100644
--- a/.github/workflows/docker_release.yml
+++ b/.github/workflows/docker_release.yml
@@ -12,19 +12,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Filter Helm Releases
-        run: |
-          echo "Detected that GitHub release is for the Helm chart... aborting this build as a result."
-          exit 1
-        if: startsWith(github.ref, 'refs/tags/helm-v')
-
       - name: Build
         run: |
-          docker build \
+           make ARGS='\
             --label commit=$GITHUB_SHA \
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${GITHUB_REF##*/} \
-            --tag ghcr.io/hyperledger/firefly:${GITHUB_REF##*/} .
+            --tag ghcr.io/hyperledger/firefly:${GITHUB_REF##*/}' \
+            docker
 
       - name: Tag release
         if: github.event.action == 'released'
diff --git a/Makefile b/Makefile
index 4d8c7924c2..91f34e0dda 100644
--- a/Makefile
+++ b/Makefile
@@ -90,4 +90,4 @@ swagger:
 manifest:
 		./manifestgen.sh
 docker:
-		./docker_build.sh
\ No newline at end of file
+		./docker_build.sh $(ARGS)
\ No newline at end of file
diff --git a/docker_build.sh b/docker_build.sh
index 42e5de8c28..45b65f5425 100755
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -16,6 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo $@
 
  if [[ ! -x `which jq` ]]; then echo "Please install \"jq\" to continue"; exit 1; fi
 
@@ -44,4 +45,5 @@ docker build \
     --build-arg BASE_TAG=$BASE_TAG \
     --build-arg UI_TAG=$UI_TAG \
     --build-arg UI_RELEASE=$UI_RELEASE \
+    $@ \
     .
\ No newline at end of file

From 22c707c06922fdd8fb3f88bbe92fc7ee7638cd83 Mon Sep 17 00:00:00 2001
From: Nicko Guyer <nicko.guyer@kaleido.io>
Date: Tue, 8 Feb 2022 11:29:24 -0500
Subject: [PATCH 2/2] Rename DOCKER_ARGS in build script

Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
---
 .github/workflows/docker_main.yml    | 2 +-
 .github/workflows/docker_release.yml | 2 +-
 Makefile                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml
index 7b97f861e3..46161e9d75 100644
--- a/.github/workflows/docker_main.yml
+++ b/.github/workflows/docker_main.yml
@@ -22,7 +22,7 @@ jobs:
 
       - name: Build
         run: |
-          make ARGS='\
+          make DOCKER_ARGS='\
             --label commit=$GITHUB_SHA \
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml
index 29d1dbb58f..194a51ba42 100644
--- a/.github/workflows/docker_release.yml
+++ b/.github/workflows/docker_release.yml
@@ -14,7 +14,7 @@ jobs:
 
       - name: Build
         run: |
-           make ARGS='\
+          make DOCKER_ARGS='\
             --label commit=$GITHUB_SHA \
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${GITHUB_REF##*/} \
diff --git a/Makefile b/Makefile
index 91f34e0dda..ff217030ed 100644
--- a/Makefile
+++ b/Makefile
@@ -90,4 +90,4 @@ swagger:
 manifest:
 		./manifestgen.sh
 docker:
-		./docker_build.sh $(ARGS)
\ No newline at end of file
+		./docker_build.sh $(DOCKER_ARGS)
\ No newline at end of file