From 14d96eb4aee6c63bc84430065e3b340aa33b0c25 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Sat, 20 Jan 2024 01:47:53 +0100
Subject: [PATCH] [bitnami/multus-cni] Release 4.0.2-debian-11-r132 (#55072)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/multus-cni/4/debian-11/Dockerfile     |  5 ++--
 .../multus-cni/4/debian-11/docker-compose.yml |  8 -----
 bitnami/multus-cni/README.md                  | 29 +++++--------------
 3 files changed, 10 insertions(+), 32 deletions(-)
 delete mode 100644 bitnami/multus-cni/4/debian-11/docker-compose.yml

diff --git a/bitnami/multus-cni/4/debian-11/Dockerfile b/bitnami/multus-cni/4/debian-11/Dockerfile
index 9acf9875fea0..55bd05c0113e 100644
--- a/bitnami/multus-cni/4/debian-11/Dockerfile
+++ b/bitnami/multus-cni/4/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2024-01-10T15:33:11Z" \
+      org.opencontainers.image.created="2024-01-20T00:13:27Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.0.2-debian-11-r131" \
+      org.opencontainers.image.ref.name="4.0.2-debian-11-r132" \
       org.opencontainers.image.title="multus-cni" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.0.2"
@@ -42,6 +42,7 @@ RUN apt-get autoremove --purge -y curl && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 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
 
 ENV APP_VERSION="4.0.2" \
     BITNAMI_APP_NAME="multus-cni" \
diff --git a/bitnami/multus-cni/4/debian-11/docker-compose.yml b/bitnami/multus-cni/4/debian-11/docker-compose.yml
deleted file mode 100644
index cbd70fc66fc8..000000000000
--- a/bitnami/multus-cni/4/debian-11/docker-compose.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright VMware, Inc.
-# SPDX-License-Identifier: APACHE-2.0
-
-version: '2'
-
-services:
-  multus-cni:
-    image: docker.io/bitnami/multus-cni:4
diff --git a/bitnami/multus-cni/README.md b/bitnami/multus-cni/README.md
index de602c51c7cb..34c2719952c1 100644
--- a/bitnami/multus-cni/README.md
+++ b/bitnami/multus-cni/README.md
@@ -11,14 +11,7 @@ Trademarks: This software listing is packaged by Bitnami. The respective tradema
 ## TL;DR
 
 ```console
-docker run -it --name multus-cni bitnami/multus-cni
-```
-
-### Docker Compose
-
-```console
-curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/multus-cni/docker-compose.yml > docker-compose.yml
-docker-compose up -d
+docker run -it --name multus-cni bitnami/multus-cni:latest
 ```
 
 ## Why use Bitnami Images?
@@ -74,20 +67,12 @@ Bitnami provides up-to-date versions of Multus CNI, including security patches,
 docker pull bitnami/multus-cni:latest
 ```
 
-or if you're using Docker Compose, update the value of the image property to `bitnami/multus-cni:latest`.
-
 #### Step 2: Remove the currently running container
 
 ```console
 docker rm -v multus-cni
 ```
 
-or using Docker Compose:
-
-```console
-docker-compose rm -v multus-cni
-```
-
 #### Step 3: Run the new image
 
 Re-create your container from the new image.
@@ -96,12 +81,6 @@ Re-create your container from the new image.
 docker run --name multus-cni bitnami/multus-cni:latest
 ```
 
-or using Docker Compose:
-
-```console
-docker-compose up multus-cni
-```
-
 ## Configuration
 
 ### Running commands
@@ -114,6 +93,12 @@ docker run --rm --entrypoint /opt/bitnami/multus-cni/bin/multus-daemon --name mu
 
 Check the [official Multus CNI documentation](https://github.com/k8snetworkplumbingwg/multus-cni) for more information about how to use Multus CNI.
 
+## Notable Changes
+
+### Starting January 16, 2024
+
+* The `docker-compose.yaml` file has been removed, as it was solely intended for internal testing purposes.
+
 ## Contributing
 
 We'd love for you to contribute to this Docker image. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution.