diff --git a/bitnami/cilium/1/debian-12/Dockerfile b/bitnami/cilium/1/debian-12/Dockerfile index f5ed29aa5742..81ff75dc48af 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-06-04T09:01:54Z" \ + org.opencontainers.image.created="2024-06-04T22:10:16Z" \ 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-r3" \ + org.opencontainers.image.ref.name="1.15.5-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." \ @@ -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-2-linux-${OS_ARCH}-debian-12" \ + "cilium-1.15.5-3-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/cilium/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cilium/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 566f6468940d..576b462443a7 100644 --- a/bitnami/cilium/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/cilium/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.15.5-2" + "version": "1.15.5-3" } } \ No newline at end of file diff --git a/bitnami/cilium/1/debian-12/rootfs/opt/bitnami/scripts/cilium-env.sh b/bitnami/cilium/1/debian-12/rootfs/opt/bitnami/scripts/cilium-env.sh index 7321b41c997c..8b1cf0d491af 100644 --- a/bitnami/cilium/1/debian-12/rootfs/opt/bitnami/scripts/cilium-env.sh +++ b/bitnami/cilium/1/debian-12/rootfs/opt/bitnami/scripts/cilium-env.sh @@ -44,8 +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_LIB_DIR="${CILIUM_BASE_DIR}/var/lib" +export CILIUM_RUN_DIR="${CILIUM_BASE_DIR}/var/run" export CILIUM_CNI_BIN_DIR="${CILIUM_BASE_DIR}/cni/bin" # System users (when running with a privileged user) 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 1084f98ff435..5b98a09c0cc6 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 @@ -17,6 +17,11 @@ if [[ "$(get_os_metadata --id)" != "photon" ]]; then cilium_bash_completion fi +# Ensure non-root user has write permissions on a set of directories +for dir in "$CILIUM_LIB_DIR" "$CILIUM_RUN_DIR" ; do + ensure_dir_exists "$dir" + chmod -R g+rwX "$dir" +done # 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"