diff --git a/bitnami/consul/2/debian-12/Dockerfile b/bitnami/consul/2/debian-12/Dockerfile index ca77c003a9d8..9768e4b25c35 100644 --- a/bitnami/consul/2/debian-12/Dockerfile +++ b/bitnami/consul/2/debian-12/Dockerfile @@ -7,13 +7,13 @@ 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-10T21:11:51Z" \ + org.opencontainers.image.created="2026-06-19T08:39:44Z" \ 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" \ org.opencontainers.image.title="consul" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="2.0.0" + org.opencontainers.image.version="2.0.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -29,7 +29,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=( \ "render-template-1.0.9-167-linux-${OS_ARCH}-debian-12" \ - "consul-2.0.0-4-linux-${OS_ARCH}-debian-12" \ + "consul-2.0.1-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -48,9 +48,9 @@ RUN uninstall_packages curl COPY rootfs / RUN /opt/bitnami/scripts/consul/postunpack.sh -ENV APP_VERSION="2.0.0" \ +ENV APP_VERSION="2.0.1" \ BITNAMI_APP_NAME="consul" \ - IMAGE_REVISION="4" \ + IMAGE_REVISION="0" \ 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-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 deleted file mode 100644 index d4f74c9be521..000000000000 --- a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-4-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 944328bf01b4..000000000000 --- a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.0-4-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -b5d087542f74e8559eec0bf418807f74f4f65716145fd262babc26450dbdccf2 consul-2.0.0-4-linux-arm64-debian-12.tar.gz diff --git a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.1-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.1-0-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..f3496c4e09d9 --- /dev/null +++ b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.1-0-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +6aa37a18f4cb3754fd3eb756a50b90882abe712ec5dee4240e0f724a085f97da consul-2.0.1-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.1-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.1-0-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..7e7952c191a7 --- /dev/null +++ b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/checksums/consul-2.0.1-0-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +171737992aa4a8cd0ebfa16ab52924976d8d4f369e376d9ad552f7ee7d156466 consul-2.0.1-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh index 18445e7d27fa..833ee5ab1d65 100644 --- a/bitnami/consul/2/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/consul/2/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 "$@" }