diff --git a/bitnami/argo-cd/3.4/debian-12/Dockerfile b/bitnami/argo-cd/3.4/debian-12/Dockerfile index c796806dea21..fb15193f34cf 100644 --- a/bitnami/argo-cd/3.4/debian-12/Dockerfile +++ b/bitnami/argo-cd/3.4/debian-12/Dockerfile @@ -3,11 +3,11 @@ FROM docker.io/bitnami/minideb:bookworm -ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" +ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-06-05T08:32:15Z" \ + org.opencontainers.image.created="2026-06-10T17:39:21Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/argo-cd/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/argo-cd" \ @@ -29,12 +29,12 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ "nss-wrapper-1.1.16-0-linux-${OS_ARCH}-debian-12" \ - "helm-4.2.0-3-linux-${OS_ARCH}-debian-12" \ - "argo-cd-3.4.3-3-linux-${OS_ARCH}-debian-12" \ + "helm-4.2.0-4-linux-${OS_ARCH}-debian-12" \ + "argo-cd-3.4.3-4-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ + curl -SsLf "${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ fi ; \ sha256sum -c "/opt/bitnami/checksums/${COMPONENT}.tar.gz.sha256" ; \ tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ @@ -51,7 +51,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/argo-cd/postunpack.sh ENV APP_VERSION="3.4.3" \ BITNAMI_APP_NAME="argo-cd" \ - IMAGE_REVISION="3" \ + IMAGE_REVISION="4" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/helm/bin:/opt/bitnami/argo-cd/bin:/opt/bitnami/argo-cd/hack:/opt/bitnami/ksonnet/bin:/opt/bitnami/kustomize/bin:$PATH" USER 1001 diff --git a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/argo-cd-3.4.3-3-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/argo-cd-3.4.3-3-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index b56e5a185495..000000000000 --- a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/argo-cd-3.4.3-3-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -18a4a1daf4e5de6bf94270ad7d63024de914f6fe25b28a0f3b31e859d1b2e77a argo-cd-3.4.3-3-linux-amd64-debian-12.tar.gz diff --git a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/argo-cd-3.4.3-3-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/argo-cd-3.4.3-3-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 83eac87c6c18..000000000000 --- a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/argo-cd-3.4.3-3-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -1ad7b09333f9cc3077a7b58a0eaacc4ebb0c26a348d1af5540c96044f128ef6a argo-cd-3.4.3-3-linux-arm64-debian-12.tar.gz diff --git a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/argo-cd-3.4.3-4-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/argo-cd-3.4.3-4-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..7a80e1baee1c --- /dev/null +++ b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/argo-cd-3.4.3-4-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +6154fa3b38af6c774a84c25025f5e75a10e6e6ddc93078f68dd41ece559c1c56 argo-cd-3.4.3-4-linux-amd64-debian-12.tar.gz diff --git a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/argo-cd-3.4.3-4-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/argo-cd-3.4.3-4-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..add42db595f8 --- /dev/null +++ b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/argo-cd-3.4.3-4-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +5ff5060458c554ec6eee678aceae488335f46aab80c3ca8ab30e1a71d81215a6 argo-cd-3.4.3-4-linux-arm64-debian-12.tar.gz diff --git a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/helm-4.2.0-3-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/helm-4.2.0-3-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index cc108ddb5eee..000000000000 --- a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/helm-4.2.0-3-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -1645ec817bb4000340c5df565b2f6b62f9bd6f9f1ea2f8a207f90dfc69f4e740 helm-4.2.0-3-linux-amd64-debian-12.tar.gz diff --git a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/helm-4.2.0-3-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/helm-4.2.0-3-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 8746dbe0ef9b..000000000000 --- a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/helm-4.2.0-3-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -480770db75ed692e7a3b7e9b072f3616ebe0831458a9c0ef4e6a716692ff49bc helm-4.2.0-3-linux-arm64-debian-12.tar.gz diff --git a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/helm-4.2.0-4-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/helm-4.2.0-4-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..5f1d7449435c --- /dev/null +++ b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/helm-4.2.0-4-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +529584e92b041058fb775f05f5bf8472b8d4631258fbe66b16c59d6182f818ec helm-4.2.0-4-linux-amd64-debian-12.tar.gz diff --git a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/helm-4.2.0-4-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/helm-4.2.0-4-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..1f61011ef87c --- /dev/null +++ b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/checksums/helm-4.2.0-4-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +c43a00e745177ddfa2c88fc8abcb734cdd1ab7cefa9c3224e4d03e9b9b787dd1 helm-4.2.0-4-linux-arm64-debian-12.tar.gz diff --git a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh @@ -170,7 +170,7 @@ ensure_user_exists() { if [[ -n "$home" ]]; then mkdir -p "$home" usermod -d "$home" "$user" >/dev/null 2>&1 - configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" + configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" -n fi } diff --git a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -20,7 +20,7 @@ ######################### is_int() { local -r int="${1:?missing value}" - if [[ "$int" =~ ^-?[0-9]+ ]]; then + if [[ "$int" =~ ^-?[0-9]+$ ]]; then true else false diff --git a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/argo-cd/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -49,3 +49,36 @@ get_sematic_version () { fi fi } + +######################## +# Compares two semantic versions +# Arguments: +# $1 - version1: first version to compare +# $2 - version2: second version to compare +# Returns: +# -1 if version1 is less than version2 +# 0 if version1 is equal to version2 +# 1 if version1 is greater than version2 +######################### +compare_semantic_versions() { + local version1="${1:?version1 is required}" + local version2="${2:?version2 is required}" + local major1 major2 minor1 minor2 patch1 patch2 + + major1="$(get_sematic_version "$version1" 1)" + major2="$(get_sematic_version "$version2" 1)" + minor1="$(get_sematic_version "$version1" 2)" + minor2="$(get_sematic_version "$version2" 2)" + patch1="$(get_sematic_version "$version1" 3)" + patch2="$(get_sematic_version "$version2" 3)" + + if [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -eq "$patch2" ]]; then + echo "0" + elif [[ "$major1" -lt "$major2" ]] || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -lt "$minor2" ]]; } || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -lt "$patch2" ]]; }; then + echo "-1" + else + echo "1" + fi +}