diff --git a/bitnami/clickhouse-keeper/25/debian-12/Dockerfile b/bitnami/clickhouse-keeper/25/debian-12/Dockerfile index 5f3921b330ce..0e518b1b4a7d 100644 --- a/bitnami/clickhouse-keeper/25/debian-12/Dockerfile +++ b/bitnami/clickhouse-keeper/25/debian-12/Dockerfile @@ -8,10 +8,10 @@ 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-06-03T12:50:01Z" \ + org.opencontainers.image.created="2025-06-13T10:09:41Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse-keeper/README.md" \ - org.opencontainers.image.ref.name="25.5.2-debian-12-r0" \ + org.opencontainers.image.ref.name="25.5.2-debian-12-r1" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse-keeper" \ org.opencontainers.image.title="clickhouse-keeper" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl procps xmlstarlet RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "clickhouse-keeper-25.5.2-0-linux-${OS_ARCH}-debian-12" \ + "clickhouse-keeper-25.5.2-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -43,6 +43,7 @@ RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true +RUN uninstall_packages curl COPY rootfs / RUN /opt/bitnami/scripts/clickhouse-keeper/postunpack.sh diff --git a/bitnami/clickhouse-keeper/25/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/clickhouse-keeper/25/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index f8e492167970..26464338ddfe 100644 --- a/bitnami/clickhouse-keeper/25/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/clickhouse-keeper/25/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "25.5.2-0" + "version": "25.5.2-1" } } \ No newline at end of file diff --git a/bitnami/clickhouse-keeper/25/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/clickhouse-keeper/25/debian-12/prebuildfs/usr/sbin/uninstall_packages new file mode 100755 index 000000000000..615c430e4e68 --- /dev/null +++ b/bitnami/clickhouse-keeper/25/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/clickhouse-keeper/README.md b/bitnami/clickhouse-keeper/README.md index cd2d50d90347..109232ccfa5c 100644 --- a/bitnami/clickhouse-keeper/README.md +++ b/bitnami/clickhouse-keeper/README.md @@ -138,7 +138,7 @@ services: networks: - my-network myapp: - image: 'YOUR_APPLICATION_IMAGE' + image: YOUR_APPLICATION_IMAGE networks: - my-network ```