diff --git a/bitnami/consul/2/debian-12/Dockerfile b/bitnami/consul/2/debian-12/Dockerfile index 65e23f8dec9d..ca77c003a9d8 100644 --- a/bitnami/consul/2/debian-12/Dockerfile +++ b/bitnami/consul/2/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-05T07:41:22Z" \ + org.opencontainers.image.created="2026-06-10T21:11:51Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/consul/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/consul" \ @@ -28,12 +28,12 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "render-template-1.0.9-166-linux-${OS_ARCH}-debian-12" \ - "consul-2.0.0-3-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.9-167-linux-${OS_ARCH}-debian-12" \ + "consul-2.0.0-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 ; \ @@ -50,7 +50,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/consul/postunpack.sh ENV APP_VERSION="2.0.0" \ BITNAMI_APP_NAME="consul" \ - IMAGE_REVISION="3" \ + IMAGE_REVISION="4" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/consul/bin:$PATH" EXPOSE 8300 8301 8500 8600 diff --git a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-3-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-3-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 3b9c0e0da3ef..000000000000 --- a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-3-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -63c052e8154754c1c9b1f2358ee8dd3e5773cf555ba8dda5d1350075ac64f55d consul-2.0.0-3-linux-amd64-debian-12.tar.gz diff --git a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-3-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-3-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 8e720eac7e54..000000000000 --- a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-3-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -98b0cbfa13481ade6da159a523731681afd38175c1ffdc2a8090ee6d227c965e consul-2.0.0-3-linux-arm64-debian-12.tar.gz diff --git a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-4-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-4-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..d4f74c9be521 --- /dev/null +++ b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-4-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +a9a50c3860b21465215d91991a7f6ce9746588e7a9b3b219c276a5c441c6861a consul-2.0.0-4-linux-amd64-debian-12.tar.gz diff --git a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-4-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-4-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..944328bf01b4 --- /dev/null +++ b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-4-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +b5d087542f74e8559eec0bf418807f74f4f65716145fd262babc26450dbdccf2 consul-2.0.0-4-linux-arm64-debian-12.tar.gz diff --git a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 09a2ab4133ea..000000000000 --- a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -e2467be27e79a387c78b8ef3a57ceaa07bea65009972571f20dcf58631656e0b render-template-1.0.9-166-linux-amd64-debian-12.tar.gz diff --git a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 25ae43b180a6..000000000000 --- a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -c2c7634c5c0882d2dbd822744f6b5bdb074a07a1abf710c67e1206f1c20b8afa render-template-1.0.9-166-linux-arm64-debian-12.tar.gz diff --git a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..5678e3bf679f --- /dev/null +++ b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +f311b56146985169ff7d24083cbb4786b68f3f668707ec04901b54b91bec4d98 render-template-1.0.9-167-linux-amd64-debian-12.tar.gz diff --git a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..8b1c3ffbce03 --- /dev/null +++ b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +0904d2f41140fa1f027ab31e6303d5f648a71b9ab241510a69188f7970d59c02 render-template-1.0.9-167-linux-arm64-debian-12.tar.gz diff --git a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/consul/2/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/consul/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/consul/2/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/consul/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/consul/2/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 +}