From bc97530b06af2e58333a8511f9ff935c9f83b0c1 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 10 Jun 2026 18:31:21 +0200 Subject: [PATCH] [bitnami/harbor-adapter-trivy] Release 2.15.1-debian-12-r5 (#94537) Signed-off-by: Bitnami Bot --- .../2/debian-12/Dockerfile | 10 +++--- ...15.1-1-linux-amd64-debian-12.tar.gz.sha256 | 1 - ...15.1-1-linux-arm64-debian-12.tar.gz.sha256 | 1 - ...15.1-2-linux-amd64-debian-12.tar.gz.sha256 | 1 + ...15.1-2-linux-arm64-debian-12.tar.gz.sha256 | 1 + .../prebuildfs/opt/bitnami/scripts/libos.sh | 2 +- .../opt/bitnami/scripts/libvalidations.sh | 2 +- .../opt/bitnami/scripts/libversion.sh | 33 +++++++++++++++++++ 8 files changed, 42 insertions(+), 9 deletions(-) delete mode 100644 bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-1-linux-amd64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-1-linux-arm64-debian-12.tar.gz.sha256 create mode 100644 bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-2-linux-amd64-debian-12.tar.gz.sha256 create mode 100644 bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-2-linux-arm64-debian-12.tar.gz.sha256 diff --git a/bitnami/harbor-adapter-trivy/2/debian-12/Dockerfile b/bitnami/harbor-adapter-trivy/2/debian-12/Dockerfile index 7b619ae93daf..44fc0ebece6b 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-12/Dockerfile +++ b/bitnami/harbor-adapter-trivy/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-02T22:48:52Z" \ + org.opencontainers.image.created="2026-06-10T16:18:09Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/harbor-adapter-trivy/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/harbor-adapter-trivy" \ @@ -28,11 +28,11 @@ 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=( \ - "harbor-adapter-trivy-2.15.1-1-linux-${OS_ARCH}-debian-12" \ + "harbor-adapter-trivy-2.15.1-2-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 ; \ @@ -49,7 +49,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/harbor-adapter-trivy/postunpack.sh ENV APP_VERSION="2.15.1" \ BITNAMI_APP_NAME="harbor-adapter-trivy" \ - IMAGE_REVISION="4" \ + IMAGE_REVISION="5" \ PATH="/opt/bitnami/harbor-adapter-trivy/bin:$PATH" WORKDIR /opt/bitnami/harbor-adapter-trivy diff --git a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-1-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index f145f0ad5a98..000000000000 --- a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-1-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -f3c78325e9015839fb65ae517c245546683a7d836ec518b4eaa3819c8f7164c5 harbor-adapter-trivy-2.15.1-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-1-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index ec7a4b24c8d9..000000000000 --- a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-1-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -61d544afaa751ae7fa92a6a3b5f9ac42b57f1434e8226d906d576c419c30b503 harbor-adapter-trivy-2.15.1-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-2-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..9b717702f310 --- /dev/null +++ b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-2-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +80086aba0351f523352ddf42f33869875f7dfcf655c85b7e89d0ec4cc93cb611 harbor-adapter-trivy-2.15.1-2-linux-amd64-debian-12.tar.gz diff --git a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-2-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..3c2eaa2c11e2 --- /dev/null +++ b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-adapter-trivy-2.15.1-2-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +103fa8efd1ec76ec32d27e7fedf54b3743af63a6d84ab3563459fa25fc7c1f5b harbor-adapter-trivy-2.15.1-2-linux-arm64-debian-12.tar.gz diff --git a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/harbor-adapter-trivy/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/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/harbor-adapter-trivy/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/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/harbor-adapter-trivy/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 +}