diff --git a/bitnami/tomcat/11.0/debian-12/Dockerfile b/bitnami/tomcat/11.0/debian-12/Dockerfile index b659f7665260..4eca10c04f06 100644 --- a/bitnami/tomcat/11.0/debian-12/Dockerfile +++ b/bitnami/tomcat/11.0/debian-12/Dockerfile @@ -8,13 +8,13 @@ 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-11T03:01:05Z" \ + org.opencontainers.image.created="2026-06-17T22:45:38Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/tomcat/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/tomcat" \ org.opencontainers.image.title="tomcat" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="11.0.22" + org.opencontainers.image.version="11.0.23" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -31,7 +31,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ COMPONENTS=( \ "render-template-1.0.9-167-linux-${OS_ARCH}-debian-12" \ "jre-21.0.11-11-1-linux-${OS_ARCH}-debian-12" \ - "tomcat-11.0.22-0-linux-${OS_ARCH}-debian-12" \ + "tomcat-11.0.23-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -51,9 +51,9 @@ RUN uninstall_packages curl COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/tomcat/postunpack.sh -ENV APP_VERSION="11.0.22" \ +ENV APP_VERSION="11.0.23" \ BITNAMI_APP_NAME="tomcat" \ - IMAGE_REVISION="5" \ + IMAGE_REVISION="0" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/tomcat/bin:$PATH" diff --git a/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/checksums/tomcat-11.0.22-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/checksums/tomcat-11.0.22-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index b015a45f0c30..000000000000 --- a/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/checksums/tomcat-11.0.22-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -ba92f90472e326a7586e95703ce37d554a3914315df79d103eee67df92092867 tomcat-11.0.22-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/checksums/tomcat-11.0.22-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/checksums/tomcat-11.0.22-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index b9acb0982451..000000000000 --- a/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/checksums/tomcat-11.0.22-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -584e7c3d93d14199a55732e09c8398ad53dcaa64a7b0896c624d485f5a71d94d tomcat-11.0.22-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/checksums/tomcat-11.0.23-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/checksums/tomcat-11.0.23-0-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..1c39b746dc89 --- /dev/null +++ b/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/checksums/tomcat-11.0.23-0-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +fe66b2702f4a93d448c750df7b79c5a44f8db2e4cde5454e574a090719eecba2 tomcat-11.0.23-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/checksums/tomcat-11.0.23-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/checksums/tomcat-11.0.23-0-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..d3fdeb7d6220 --- /dev/null +++ b/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/checksums/tomcat-11.0.23-0-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +e6179638e0974d3e2ca0e689764e28b4cb4294f71e3f8edacb88eb81b0202a9c tomcat-11.0.23-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh index 18445e7d27fa..833ee5ab1d65 100644 --- a/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/tomcat/11.0/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -39,7 +39,7 @@ persist_app() { fi pushd "$install_dir" >/dev/null || exit local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder - local -r tmp_file="/tmp/perms.acl" + local -r acl_file="$(mktemp "${TMPDIR:-/tmp}"/acl.XXXXXXXXXX)" for file_to_persist in "${files_to_persist[@]}"; do if [[ ! -f "$file_to_persist" && ! -d "$file_to_persist" ]]; then error "Cannot persist '${file_to_persist}' because it does not exist" @@ -50,22 +50,22 @@ persist_app() { file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")" # Get original permissions for existing files, which will be applied later # Exclude the root directory with 'sed', to avoid issues when copying the entirety of it to a volume - getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$tmp_file" + getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$acl_file" # Copy directories to the volume ensure_dir_exists "$file_to_persist_destination_folder" cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder" # Restore permissions pushd "$persist_dir" >/dev/null || exit if am_i_root; then - setfacl --restore="$tmp_file" + setfacl --restore="$acl_file" else # When running as non-root, don't change ownership - setfacl --restore=<(grep -E -v '^# (owner|group):' "$tmp_file") + setfacl --restore=<(grep -E -v '^# (owner|group):' "$acl_file") fi popd >/dev/null || exit done popd >/dev/null || exit - rm -f "$tmp_file" + rm -f "$acl_file" # Install the persisted files into the installation directory, via symlinks restore_persisted_app "$@" }