[bitnami/cilium] Release 1.16.0-debian-12-r4 (#70570)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot 2024-08-05 14:25:40 +02:00 committed by GitHub
parent 285ac943e8
commit e94a2cb325
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 10 deletions

View File

@ -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-07-25T10:40:00Z" \
org.opencontainers.image.created="2024-08-05T11:57:21Z" \
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.0-debian-12-r3" \
org.opencontainers.image.ref.name="1.16.0-debian-12-r4" \
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/cilium" \
org.opencontainers.image.title="cilium" \
org.opencontainers.image.vendor="Broadcom, Inc." \
@ -32,7 +32,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
"llvm-18.1.8-0-linux-${OS_ARCH}-debian-12" \
"gops-0.3.28-4-linux-${OS_ARCH}-debian-12" \
"bpftool-7.4.0-1-linux-${OS_ARCH}-debian-12" \
"cilium-1.16.0-2-linux-${OS_ARCH}-debian-12" \
"cilium-1.16.0-3-linux-${OS_ARCH}-debian-12" \
) ; \
for COMPONENT in "${COMPONENTS[@]}"; do \
if [ ! -f "${COMPONENT}.tar.gz" ]; then \

View File

@ -9,7 +9,7 @@
"arch": "amd64",
"distro": "debian-12",
"type": "NAMI",
"version": "1.16.0-2"
"version": "1.16.0-3"
},
"gops": {
"arch": "amd64",

View File

@ -57,18 +57,27 @@ else
fi
fi
original_command="$(basename "$0")"
# Update links to point to the selected binaries
if [ -x /usr/sbin/alternatives ]; then
# Fedora/SUSE style alternatives
alternatives --set iptables "/usr/sbin/iptables-${mode}" > /dev/null
alternatives --set iptables "/usr/sbin/iptables-${mode}" > /dev/null || failed=1
if [ "${failed:-0}" = 1 ]; then
# Try the multi-binary if alternatives failed
exec "/usr/sbin/xtables-${mode}-multi" "$original_command" "$@"
fi
elif [ -x /usr/sbin/update-alternatives ] || [ -x /usr/bin/update-alternatives ]; then
# Debian style alternatives
update-alternatives --set iptables "/usr/sbin/iptables-${mode}" > /dev/null
update-alternatives --set ip6tables "/usr/sbin/ip6tables-${mode}" > /dev/null
update-alternatives --set iptables "/usr/sbin/iptables-${mode}" > /dev/null || failed=1
update-alternatives --set ip6tables "/usr/sbin/ip6tables-${mode}" > /dev/null || failed=1
if [ "${failed:-0}" = 1 ]; then
# Try the multi-binary if update-alternatives failed
exec "/usr/sbin/xtables-${mode}-multi" "$original_command" "$@"
fi
else
# fake it, though this will probably also fail
exec "/usr/sbin/xtables-${mode}-multi" "$0" "$@"
# Try the multi-binary
exec "/usr/sbin/xtables-${mode}-multi" "$original_command" "$@"
fi
# Now re-exec the original command with the newly-selected alternative
exec "$0" "$@"
exec "$original_command" "$@"