From ab97c67d79a79d9c6b0dc81b5dbe2fc5fd216a5a Mon Sep 17 00:00:00 2001
From: Nick <10092581+NickLarsenNZ@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:22:09 +1300
Subject: [PATCH] fix: remove comments from multi-line command (#4)

* fix: remove comments from multi-line command

* chore: improve outputs
---
 README.md                        |  8 +++++---
 build-container-image/action.yml | 21 +++++++++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index d065234..70f79b6 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,8 @@ All subsequent tasks must use this value to ensure consistency.
 
 #### Inputs
 
-- `image-name`
-- `image-index-manifest-tag`
+- `image-name` (eg: `kafka`)
+- `image-index-manifest-tag` (eg: `3.4.1-stackable0.0.0-dev`)
 - `container-file` (defaults to `Dockerfile`)
 - `build-context` (defaults to `.`)
 <!--
@@ -48,7 +48,9 @@ TODO (@NickLarsenNZ): Allow optional buildx cache
 
 #### Outputs
 
-- `image-manifest-tag`
+- `image-repository-uri` (eg: `localhost/kafka`)
+- `image-manifest-tag` (eg: `3.4.1-stackable0.0.0-dev-amd64`)
+- `image-manifest-uri` (eg: `localhost/kafka:3.4.1-stackable0.0.0-dev-amd64`)
 
 [build-container-image]: ./build-container-image/action.yml
 
diff --git a/build-container-image/action.yml b/build-container-image/action.yml
index da3e89d..988ecf4 100644
--- a/build-container-image/action.yml
+++ b/build-container-image/action.yml
@@ -25,11 +25,20 @@ inputs:
   #   description: Build cache password
   #   required: true
 outputs:
+  image-repository-uri:
+    description: |
+      The locally tagged name of the image, for example: `localhost/kafka`
+    value: ${{ steps.build-image.outputs.IMAGE_REPOSITORY_URI }}
   image-manifest-tag:
     description: |
       Human-readable tag (usually the version) with architecture information,
       for example: `3.4.1-stackable0.0.0-dev-amd64`
     value: ${{ steps.build-image.outputs.IMAGE_MANIFEST_TAG }}
+  image-manifest-uri:
+    description: |
+      The full image manifest uri, for example:
+      localhost/kafka:3.4.1-stackable0.0.0-dev-amd64
+    value: ${{ steps.build-image.outputs.IMAGE_MANIFEST_URI }}
 runs:
   using: composite
   steps:
@@ -78,11 +87,15 @@ runs:
         IMAGE_MANIFEST_TAG="${IMAGE_INDEX_MANIFEST_TAG}-${IMAGE_ARCH}"
         echo "IMAGE_MANIFEST_TAG=${IMAGE_MANIFEST_TAG}" | tee -a $GITHUB_OUTPUT
 
+        IMAGE_REPOSITORY_URI="localhost/${IMAGE_NAME}"
+        echo "IMAGE_REPOSITORY_URI=${IMAGE_REPOSITORY_URI}" | tee -a $GITHUB_OUTPUT
+
+        IMAGE_MANIFEST_URI="${IMAGE_REPOSITORY_URI}:${IMAGE_MANIFEST_TAG}"
+        echo "IMAGE_MANIFEST_URI=${IMAGE_MANIFEST_URI}" | tee -a $GITHUB_OUTPUT
+
+        # TODO (@NickLarsenNZ): Allow optional buildx cache
         docker buildx build \
         --file "${CONTAINER_FILE}" \
         --platform "linux/${IMAGE_ARCH}" \
-        --tag "localhost/${IMAGE_NAME}:${IMAGE_MANIFEST_TAG}" \
-        # TODO (@NickLarsenNZ): Allow optional buildx cache
-        # --cache-to ... \
-        # --cache-from ... \
+        --tag "${IMAGE_MANIFEST_URI}" \
         "${BUILD_CONTEXT}"