diff --git a/bitnami/victoriametrics-vmselect/1/debian-12/Dockerfile b/bitnami/victoriametrics-vmselect/1/debian-12/Dockerfile index 58a9a5dd9f4f..e91b6afd6215 100644 --- a/bitnami/victoriametrics-vmselect/1/debian-12/Dockerfile +++ b/bitnami/victoriametrics-vmselect/1/debian-12/Dockerfile @@ -15,7 +15,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "victoriametrics-1.118.0-1-linux-${OS_ARCH}-debian-12" \ + "victoriametrics-1.118.0-2-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -26,6 +26,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done +RUN uninstall_packages curl ###### @@ -38,9 +39,9 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="scratch" \ - org.opencontainers.image.created="2025-06-03T12:24:47Z" \ + org.opencontainers.image.created="2025-06-06T16:52:20Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ - org.opencontainers.image.ref.name="1.118.0-debian-12-r1" \ + org.opencontainers.image.ref.name="1.118.0-debian-12-r2" \ org.opencontainers.image.title="victoriametrics-vmselect" \ org.opencontainers.image.vendor="Broadcom, Inc." \ org.opencontainers.image.version="1.118.0" diff --git a/bitnami/victoriametrics-vmselect/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/victoriametrics-vmselect/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index f76c825f21ac..e419b843dd7e 100644 --- a/bitnami/victoriametrics-vmselect/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/victoriametrics-vmselect/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.118.0-1" + "version": "1.118.0-2" } } \ No newline at end of file diff --git a/bitnami/victoriametrics-vmselect/1/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/victoriametrics-vmselect/1/debian-12/prebuildfs/usr/sbin/uninstall_packages new file mode 100755 index 000000000000..615c430e4e68 --- /dev/null +++ b/bitnami/victoriametrics-vmselect/1/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