diff --git a/bitnami/jenkins/2/debian-12/Dockerfile b/bitnami/jenkins/2/debian-12/Dockerfile index 80296a15e4af..f4f2196009d5 100644 --- a/bitnami/jenkins/2/debian-12/Dockerfile +++ b/bitnami/jenkins/2/debian-12/Dockerfile @@ -9,14 +9,13 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-05-30T14:55:19Z" \ + org.opencontainers.image.created="2025-06-25T15:40:29Z" \ 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.ref.name="2.504.2-debian-12-r1" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/jenkins" \ org.opencontainers.image.title="jenkins" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="2.504.2" + org.opencontainers.image.version="2.504.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -27,11 +26,13 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl fontconfig git jq libfontconfig1 openssh-client procps unzip zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ +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.7-16-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.8-0-linux-${OS_ARCH}-debian-12" \ "jre-17.0.15-10-0-linux-${OS_ARCH}-debian-12" \ - "jenkins-2.504.2-0-linux-${OS_ARCH}-debian-12" \ + "jenkins-2.504.3-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -50,7 +51,7 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/jenkins/postunpack.sh -ENV APP_VERSION="2.504.2" \ +ENV APP_VERSION="2.504.3" \ BITNAMI_APP_NAME="jenkins" \ 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/.bitnami_components.json b/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index b1c288a90bea..07721f941bf3 100644 --- a/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jenkins/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "2.504.2-0" + "version": "2.504.3-0" }, "jre": { "arch": "amd64", @@ -15,6 +15,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.7-16" + "version": "1.0.8-0" } } \ No newline at end of file diff --git a/bitnami/jenkins/2/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/jenkins/2/debian-12/prebuildfs/usr/sbin/uninstall_packages new file mode 100755 index 000000000000..615c430e4e68 --- /dev/null +++ b/bitnami/jenkins/2/debian-12/prebuildfs/usr/sbin/uninstall_packages @@ -0,0 +1,26 @@ +#!/bin/sh +# Copyright Broadcom, Inc. All Rights Reserved. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get autoremove --purge -y "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/jenkins/2/debian-12/tags-info.yaml b/bitnami/jenkins/2/debian-12/tags-info.yaml index 8c9d5174f45a..8e064e5e2231 100644 --- a/bitnami/jenkins/2/debian-12/tags-info.yaml +++ b/bitnami/jenkins/2/debian-12/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: -- "2" -- 2-debian-12 -- 2.504.2 -- latest + - "2" + - 2-debian-12 + - 2.504.3 + - latest diff --git a/bitnami/jenkins/README.md b/bitnami/jenkins/README.md index 0b6925b28605..e8fa33d8368e 100644 --- a/bitnami/jenkins/README.md +++ b/bitnami/jenkins/README.md @@ -110,7 +110,7 @@ This requires a minor change to the [`docker-compose.yml`](https://github.com/bi jenkins: ... volumes: -- - 'jenkins_data:/bitnami/jenkins +- - jenkins_data:/bitnami/jenkins + - /path/to/jenkins-persistence:/bitnami/jenkins - volumes: - jenkins_data: