From c48b0fee5a24f5ecb898fcc92ba4444262f72504 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 27 Sep 2024 11:54:31 +0200 Subject: [PATCH] [bitnami/cilium] Release cilium-1.16.2-debian-12-r1 (#72791) Signed-off-by: Bitnami Bot --- bitnami/cilium/1/debian-12/Dockerfile | 4 ++-- .../opt/bitnami/scripts/cilium/postunpack.sh | 22 ++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/bitnami/cilium/1/debian-12/Dockerfile b/bitnami/cilium/1/debian-12/Dockerfile index 52cb4965fd6d..e17c8f18137f 100644 --- a/bitnami/cilium/1/debian-12/Dockerfile +++ b/bitnami/cilium/1/debian-12/Dockerfile @@ -7,11 +7,11 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-09-26T11:00:22Z" \ + org.opencontainers.image.created="2024-09-27T09:26:23Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/cilium/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.16.2-debian-12-r0" \ + org.opencontainers.image.ref.name="1.16.2-debian-12-r1" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/cilium" \ org.opencontainers.image.title="cilium" \ org.opencontainers.image.vendor="Broadcom, Inc." \ diff --git a/bitnami/cilium/1/debian-12/rootfs/opt/bitnami/scripts/cilium/postunpack.sh b/bitnami/cilium/1/debian-12/rootfs/opt/bitnami/scripts/cilium/postunpack.sh index 40b39bfe55f5..44e2dacbf8f9 100755 --- a/bitnami/cilium/1/debian-12/rootfs/opt/bitnami/scripts/cilium/postunpack.sh +++ b/bitnami/cilium/1/debian-12/rootfs/opt/bitnami/scripts/cilium/postunpack.sh @@ -28,24 +28,30 @@ done ln -s "$CILIUM_LIB_DIR" "/var/lib/cilium" ln -s "$CILIUM_RUN_DIR" "/var/run/cilium" -# Point the iptables binaries to iptables-wrapper -if [ -x /usr/sbin/alternatives ]; then +ALTERNATIVES_CMD=update-alternatives +if [ -x /usr/bin/alternatives ] || [ -x /usr/sbin/alternatives ]; then # Fedora/SUSE style alternatives - alternatives \ + ALTERNATIVES_CMD=alternatives +fi + +# Point the iptables binaries to iptables-wrapper +if "$ALTERNATIVES_CMD" 2>&1 | grep follower; then + # New version of command which uses follower + "$ALTERNATIVES_CMD" \ --install /usr/sbin/iptables iptables /usr/sbin/iptables-wrapper 100 \ --follower /usr/sbin/iptables-restore iptables-restore /usr/sbin/iptables-wrapper \ --follower /usr/sbin/iptables-save iptables-save /usr/sbin/iptables-wrapper - alternatives \ + "$ALTERNATIVES_CMD" \ --install /usr/sbin/ip6tables ip6tables /usr/sbin/iptables-wrapper 100 \ --follower /usr/sbin/ip6tables-restore ip6tables-restore /usr/sbin/iptables-wrapper \ --follower /usr/sbin/ip6tables-save ip6tables-save /usr/sbin/iptables-wrapper -elif [ -x /usr/sbin/update-alternatives ] || [ -x /usr/bin/update-alternatives ]; then - # Debian style alternatives - update-alternatives \ +else + # Old version of command, which uses slave + "$ALTERNATIVES_CMD" \ --install /usr/sbin/iptables iptables /usr/sbin/iptables-wrapper 100 \ --slave /usr/sbin/iptables-restore iptables-restore /usr/sbin/iptables-wrapper \ --slave /usr/sbin/iptables-save iptables-save /usr/sbin/iptables-wrapper - update-alternatives \ + "$ALTERNATIVES_CMD" \ --install /usr/sbin/ip6tables ip6tables /usr/sbin/iptables-wrapper 100 \ --slave /usr/sbin/ip6tables-restore ip6tables-restore /usr/sbin/iptables-wrapper \ --slave /usr/sbin/ip6tables-save ip6tables-save /usr/sbin/iptables-wrapper