From 194272326fd0be2aa4a8c45159d91795ed4c18a6 Mon Sep 17 00:00:00 2001
From: Jimmy Jones <jimmyjones2@gmx.co.uk>
Date: Thu, 1 Aug 2024 20:52:23 +0100
Subject: [PATCH] Merge upstream buildan 0.7 and 0.8 changes

---
 scripts/buildah-bud.sh      | 14 ++++++++++----
 templates/task-buildah.yaml |  8 ++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/scripts/buildah-bud.sh b/scripts/buildah-bud.sh
index eff9cda..b890dda 100644
--- a/scripts/buildah-bud.sh
+++ b/scripts/buildah-bud.sh
@@ -34,6 +34,12 @@ phase "Inspecting context '${PARAMS_CONTEXT}'"
 [[ ! -d "${PARAMS_CONTEXT}" ]] &&
     fail "CONTEXT param is not found at '${PARAMS_CONTEXT}', on source workspace"
 
+phase "Building build args"
+BUILD_ARGS=()
+for buildarg in "$@"; do
+    BUILD_ARGS+=("--build-arg=$buildarg")
+done
+
 # Handle optional dockerconfig secret
 if [[ "${WORKSPACES_DOCKERCONFIG_BOUND}" == "true" ]]; then
 
@@ -73,10 +79,10 @@ phase "Building '${PARAMS_IMAGE}' based on '${DOCKERFILE_FULL}'"
 
 _buildah bud ${PARAMS_BUILD_EXTRA_ARGS} \
     $ENTITLEMENT_VOLUME \
-    --no-cache \
+    "${BUILD_ARGS[@]}" \
     --file="${DOCKERFILE_FULL}" \
     --tag="${PARAMS_IMAGE}" \
-    ${PARAMS_CONTEXT}
+    "${PARAMS_CONTEXT}"
 
 if [[ "${PARAMS_SKIP_PUSH}" == "true" ]]; then
     phase "Skipping pushing '${PARAMS_IMAGE}' to the container registry!"
@@ -98,8 +104,8 @@ declare -r digest_file="/tmp/buildah-digest.txt"
 
 _buildah push ${PARAMS_PUSH_EXTRA_ARGS} \
     --digestfile="${digest_file}" \
-    ${PARAMS_IMAGE} \
-    docker://${PARAMS_IMAGE}
+    "${PARAMS_IMAGE}" \
+    "docker://${PARAMS_IMAGE}"
 
 #
 # Results
diff --git a/templates/task-buildah.yaml b/templates/task-buildah.yaml
index 08c0fbe..3e611d4 100644
--- a/templates/task-buildah.yaml
+++ b/templates/task-buildah.yaml
@@ -44,6 +44,12 @@ spec:
       default: ./Dockerfile
       description: |
         Path to the `Dockerfile` (or `Containerfile`) relative to the `source` workspace.
+    - name: BUILD_ARGS
+      type: array
+      default:
+        - ""
+      description: |
+        Dockerfile build arguments, array of key=value
 
 {{- include "params_buildah_common" . | nindent 4 }}
 {{- include "params_common" . | nindent 4 }}
@@ -81,6 +87,8 @@ spec:
     - name: build
       image: {{ .Values.images.buildah }}
       workingDir: /workspace/source
+      args:
+        - $(params.BUILD_ARGS[*])
       command:
         - /scripts/buildah-bud.sh
       securityContext: