From b173c4beb27f547b797e08b5abb32087d29e95e1 Mon Sep 17 00:00:00 2001
From: Antonio Huete Jimenez <antonio@100x100fanclub.com>
Date: Fri, 17 Mar 2023 15:48:48 +0100
Subject: [PATCH] Allow overriding version/appversion on when oci registry is
 enabled

---
 entrypoint.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 49059f3..845fb21 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -24,19 +24,29 @@ else
   FORCE=""
 fi
 
-if [ "$UPDATE_DEPENDENCIES" == "1" ] || [ "$UPDATE_DEPENDENCIES" == "True" ] || [ "$UPDATE_DEPENDENCIES" == "TRUE" ] || [ "$UPDATE_DEPENDENCIES" == "true" ]; then
+if [ "$UPDATE_DEPENDENCIES" == "1" ] || [[ "$UPDATE_DEPENDENCIES" == [Tt][Rr][Uu][Ee] ]]; then
   UPDATE_DEPENDENCIES="-u"
 else
   UPDATE_DEPENDENCIES=""
 fi
 
+if [ "$REGISTRY_VERSION" ]; then
+  echo "Version is defined, using as parameter."
+  REGISTRY_VERSION="--version ${REGISTRY_VERSION}"
+fi
+
+if [ "$REGISTRY_APPVERSION" ]; then
+  echo "App version is defined, using as parameter."
+  REGISTRY_APPVERSION="--app-version ${REGISTRY_APPVERSION}"
+fi
+
 if [ "$USE_OCI_REGISTRY" == "TRUE" ] || [ "$USE_OCI_REGISTRY" == "true" ]; then
   export HELM_EXPERIMENTAL_OCI=1
   echo "OCI SPECIFIED, USING HELM OCI FEATURES"
   REGISTRY=$(echo "${REGISTRY_URL}" | awk -F[/:] '{print $4}') # Get registry host from url
   echo "${REGISTRY_ACCESS_TOKEN}" | helm registry login -u ${REGISTRY_USERNAME} --password-stdin ${REGISTRY} # Authenticate registry
   echo "Packaging chart '$CHART_FOLDER'"
-  PKG_RESPONSE=$(helm package $CHART_FOLDER $UPDATE_DEPENDENCIES) # package chart
+  PKG_RESPONSE=$(helm package ${CHART_FOLDER} ${REGISTRY_VERSION} ${REGISTRY_APPVERSION} ${UPDATE_DEPENDENCIES}) # package chart
   echo "$PKG_RESPONSE"
   CHART_TAR_GZ=$(basename "$PKG_RESPONSE") # extract tar name from helm package stdout
   echo "Pushing chart $CHART_TAR_GZ to '$REGISTRY_URL'"
@@ -61,16 +71,6 @@ if [ "$REGISTRY_PASSWORD" ]; then
   REGISTRY_PASSWORD="--password ${REGISTRY_PASSWORD}"
 fi
 
-if [ "$REGISTRY_VERSION" ]; then
-  echo "Version is defined, using as parameter."
-  REGISTRY_VERSION="--version ${REGISTRY_VERSION}"
-fi
-
-if [ "$REGISTRY_APPVERSION" ]; then
-  echo "App version is defined, using as parameter."
-  REGISTRY_APPVERSION="--app-version ${REGISTRY_APPVERSION}"
-fi
-
 if [ "$ADD_REPOSITORIES" != "" ]; then
   while read addRepositoryArgs;
   do