[bitnami/cilium] Release 1.15.5-debian-12-r3 (#67401)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot 2024-06-04 11:35:55 +02:00 committed by GitHub
parent c969cdc2e0
commit 52a155b267
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 5 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-05-20T11:16:54Z" \
org.opencontainers.image.created="2024-06-04T09:01:54Z" \
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.15.5-debian-12-r2" \
org.opencontainers.image.ref.name="1.15.5-debian-12-r3" \
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/cilium" \
org.opencontainers.image.title="cilium" \
org.opencontainers.image.vendor="Broadcom, Inc." \
@ -29,7 +29,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
RUN install_packages bash-completion ca-certificates curl iproute2 ipset iptables procps
RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
COMPONENTS=( \
"cilium-1.15.5-1-linux-${OS_ARCH}-debian-12" \
"cilium-1.15.5-2-linux-${OS_ARCH}-debian-12" \
) ; \
for COMPONENT in "${COMPONENTS[@]}"; do \
if [ ! -f "${COMPONENT}.tar.gz" ]; then \

View File

@ -3,6 +3,6 @@
"arch": "amd64",
"distro": "debian-12",
"type": "NAMI",
"version": "1.15.5-1"
"version": "1.15.5-2"
}
}

View File

@ -8,6 +8,7 @@
# Load Generic Libraries
. /opt/bitnami/scripts/liblog.sh
. /opt/bitnami/scripts/libvalidations.sh
# Functions
@ -68,7 +69,12 @@ get_machine_ip() {
error "Could not find any IP address associated to hostname ${hostname}"
exit 1
fi
echo "${ip_addresses[0]}"
# Check if the first IP address is IPv6 to add brackets
if validate_ipv6 "${ip_addresses[0]}" ; then
echo "[${ip_addresses[0]}]"
else
echo "${ip_addresses[0]}"
fi
}
########################

View File

@ -44,6 +44,8 @@ unset cilium_env_vars
# Paths
export CILIUM_BASE_DIR="${BITNAMI_ROOT_DIR}/cilium"
export CILIUM_BIN_DIR="${CILIUM_BASE_DIR}/bin"
export CILIUM_LIB_DIR="${CILIUM_BASE_DIR}/lib"
export CILIUM_RUN_DIR="${CILIUM_BASE_DIR}/run"
export CILIUM_CNI_BIN_DIR="${CILIUM_BASE_DIR}/cni/bin"
# System users (when running with a privileged user)

View File

@ -16,3 +16,8 @@ if [[ "$(get_os_metadata --id)" != "photon" ]]; then
# Generate bash completion for Cilium & Hubble
cilium_bash_completion
fi
# Add symlinks to the default paths to make a similar UX as the upstream Cilium configuration
# https://github.com/cilium/cilium/blob/main/pkg/defaults/defaults.go
ln -s "$CILIUM_LIB_DIR" "/var/lib/cilium"
ln -s "$CILIUM_RUN_DIR" "/var/run/cilium"