diff --git a/bitnami/multus-cni/4/debian-12/Dockerfile b/bitnami/multus-cni/4/debian-12/Dockerfile index d9e6f810d696..5be1955a3971 100644 --- a/bitnami/multus-cni/4/debian-12/Dockerfile +++ b/bitnami/multus-cni/4/debian-12/Dockerfile @@ -8,14 +8,14 @@ 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-30T15:23:14Z" \ + org.opencontainers.image.created="2025-06-05T15:22:42Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/multus-cni/README.md" \ - org.opencontainers.image.ref.name="4.2.0-debian-12-r7" \ + org.opencontainers.image.ref.name="4.2.1-debian-12-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/multus-cni" \ org.opencontainers.image.title="multus-cni" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="4.2.0" + org.opencontainers.image.version="4.2.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl procps RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "multus-cni-4.2.0-2-linux-${OS_ARCH}-debian-12" \ + "multus-cni-4.2.1-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -44,8 +44,9 @@ RUN apt-get update && apt-get upgrade -y && \ RUN useradd -r -u 1001 -g root multus-cni RUN mkdir -p /usr/src && chmod g+x /usr/src && ln -sf /opt/bitnami/multus-cni/ /usr/src/multus-cni && ln -sf /opt/bitnami/multus-cni/bin/thin_entrypoint /thin_entrypoint && ln -sf /opt/bitnami/multus-cni/bin/install_multus /install_multus && mkdir -p /bitnami/multus-cni/host && chmod g+rwX -R /bitnami/multus-cni/host && ln -sf /bitnami/multus-cni/host /host RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true +RUN uninstall_packages curl -ENV APP_VERSION="4.2.0" \ +ENV APP_VERSION="4.2.1" \ BITNAMI_APP_NAME="multus-cni" \ PATH="/opt/bitnami/multus-cni/bin:$PATH" diff --git a/bitnami/multus-cni/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/multus-cni/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index de6ff11f271e..bde1dc5b1f86 100644 --- a/bitnami/multus-cni/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/multus-cni/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "4.2.0-2" + "version": "4.2.1-0" } } \ No newline at end of file diff --git a/bitnami/multus-cni/4/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/multus-cni/4/debian-12/prebuildfs/usr/sbin/uninstall_packages new file mode 100755 index 000000000000..615c430e4e68 --- /dev/null +++ b/bitnami/multus-cni/4/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/multus-cni/4/debian-12/tags-info.yaml b/bitnami/multus-cni/4/debian-12/tags-info.yaml index d36eb7b0fdc3..12e1f8a938a3 100644 --- a/bitnami/multus-cni/4/debian-12/tags-info.yaml +++ b/bitnami/multus-cni/4/debian-12/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "4" - 4-debian-12 -- 4.2.0 +- 4.2.1 - latest