From c478dfce0126f441182d713aacd8c9187c80fdfb Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 5 Jun 2026 14:27:56 +0200 Subject: [PATCH] [bitnami/jenkins] Release 2.555.2-debian-12-r7 (#94380) Signed-off-by: Bitnami Bot --- bitnami/jenkins/2/debian-12/Dockerfile | 6 ++-- ....9-165-linux-amd64-debian-12.tar.gz.sha256 | 1 - ....9-165-linux-arm64-debian-12.tar.gz.sha256 | 1 - ....9-166-linux-amd64-debian-12.tar.gz.sha256 | 1 + ....9-166-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 +++++++++++++++++++ .../rootfs/opt/bitnami/scripts/libjenkins.sh | 6 ++-- 9 files changed, 43 insertions(+), 10 deletions(-) delete mode 100644 bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-amd64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-arm64-debian-12.tar.gz.sha256 create mode 100644 bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 create mode 100644 bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 diff --git a/bitnami/jenkins/2/debian-12/Dockerfile b/bitnami/jenkins/2/debian-12/Dockerfile index 112d3b55205c..06094f226b08 100644 --- a/bitnami/jenkins/2/debian-12/Dockerfile +++ b/bitnami/jenkins/2/debian-12/Dockerfile @@ -8,7 +8,7 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-06-02T13:55:53Z" \ + org.opencontainers.image.created="2026-06-05T11:58:43Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/jenkins/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/jenkins" \ @@ -30,7 +30,7 @@ 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" \ - "render-template-1.0.9-165-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.9-166-linux-${OS_ARCH}-debian-12" \ "jre-21.0.11-11-1-linux-${OS_ARCH}-debian-12" \ "jenkins-2.555.2-0-linux-${OS_ARCH}-debian-12" \ ) ; \ @@ -53,7 +53,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/jenkins/postunpack.sh ENV APP_VERSION="2.555.2" \ BITNAMI_APP_NAME="jenkins" \ - IMAGE_REVISION="6" \ + IMAGE_REVISION="7" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:$PATH" diff --git a/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index ecf216f2789c..000000000000 --- a/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -374910c7361f00d393eca79a749d29f389b4522057902c7655f0a3a5ae3d1b32 render-template-1.0.9-165-linux-amd64-debian-12.tar.gz diff --git a/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index e15b6bdd7577..000000000000 --- a/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-165-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -d492024d2d8261cfb147e7b508d341b91349fd41cf41aecd0706046be8cb108b render-template-1.0.9-165-linux-arm64-debian-12.tar.gz diff --git a/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..09a2ab4133ea --- /dev/null +++ b/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +e2467be27e79a387c78b8ef3a57ceaa07bea65009972571f20dcf58631656e0b render-template-1.0.9-166-linux-amd64-debian-12.tar.gz diff --git a/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..25ae43b180a6 --- /dev/null +++ b/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +c2c7634c5c0882d2dbd822744f6b5bdb074a07a1abf710c67e1206f1c20b8afa render-template-1.0.9-166-linux-arm64-debian-12.tar.gz diff --git a/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/jenkins/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/jenkins/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/jenkins/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/jenkins/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/jenkins/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 +} diff --git a/bitnami/jenkins/2/debian-12/rootfs/opt/bitnami/scripts/libjenkins.sh b/bitnami/jenkins/2/debian-12/rootfs/opt/bitnami/scripts/libjenkins.sh index 0a287b30ee8b..cd9fbc0b8aff 100644 --- a/bitnami/jenkins/2/debian-12/rootfs/opt/bitnami/scripts/libjenkins.sh +++ b/bitnami/jenkins/2/debian-12/rootfs/opt/bitnami/scripts/libjenkins.sh @@ -322,13 +322,13 @@ jenkins_add_custom_file() { debug "Plugin ${filename} already exists" plugin_version=$(get_plugin_version "${JENKINS_HOME}/${relpath}") current_version=$(get_plugin_version "$filepath") - if [[ "$(get_sematic_version "$plugin_version" 1)" -gt "$(get_sematic_version "$current_version" 1)" ]]; then + if [[ "$(compare_semantic_versions "$plugin_version" "$current_version")" -eq "1" ]]; then action="UPGRADED" - reason="Installed version ($current_version) is older than installed version ($plugin_version)" + reason="Version to be installed ($plugin_version) is newer than current version ($current_version)" cp -pr "$(realpath "${filepath}")" "${JENKINS_HOME}/${relpath}" else action="SKIPPED" - reason="Installed version ($current_version) is lower or equal than installed version ($plugin_version)" + reason="Version to be installed ($plugin_version) is older or equal than current version ($current_version)" fi else action="INSTALLED"