From 70ac9d816ad9542a70492c285c546ced8e5e4b35 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 3 Jun 2026 02:40:13 +0200 Subject: [PATCH] [bitnami/kaniko] Release 1.25.15-debian-12-r4 (#94210) Signed-off-by: Bitnami Bot --- bitnami/kaniko/1/debian-12/Dockerfile | 14 +++---- ...5.15-1-linux-amd64-debian-12.tar.gz.sha256 | 1 + ...5.15-1-linux-arm64-debian-12.tar.gz.sha256 | 1 + .../prebuildfs/opt/bitnami/scripts/libfile.sh | 37 +++++++++++++++++++ .../prebuildfs/opt/bitnami/scripts/libfs.sh | 24 +++++++++--- 5 files changed, 64 insertions(+), 13 deletions(-) create mode 100644 bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/checksums/kaniko-1.25.15-1-linux-amd64-debian-12.tar.gz.sha256 create mode 100644 bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/checksums/kaniko-1.25.15-1-linux-arm64-debian-12.tar.gz.sha256 diff --git a/bitnami/kaniko/1/debian-12/Dockerfile b/bitnami/kaniko/1/debian-12/Dockerfile index 4c9761eb4963..797c4e228103 100644 --- a/bitnami/kaniko/1/debian-12/Dockerfile +++ b/bitnami/kaniko/1/debian-12/Dockerfile @@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-05-23T08:35:24Z" \ + org.opencontainers.image.created="2026-06-02T23:42:16Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/kaniko/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/kaniko" \ @@ -28,17 +28,17 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "kaniko-1.25.15-0-linux-${OS_ARCH}-debian-12" \ + "kaniko-1.25.15-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \ fi ; \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + sha256sum -c "/opt/bitnami/checksums/${COMPONENT}.tar.gz.sha256" ; \ tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ - rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ - done + rm -rf "${COMPONENT}".tar.gz ; \ + done ; \ + rm -rf /opt/bitnami/checksums ; RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN uninstall_packages curl @@ -48,7 +48,7 @@ ENV APP_VERSION="1.25.15" \ BITNAMI_APP_NAME="kaniko" \ DOCKER_CONFIG="/kaniko/.docker" \ DOCKER_CREDENTIAL_GCR_CONFIG="/kaniko/.config/gcloud/docker_credential_gcr_config.json" \ - IMAGE_REVISION="3" \ + IMAGE_REVISION="4" \ PATH="/kaniko:$PATH" \ SSL_CERT_DIR="/etc/ssl/certs/" \ USER="root" diff --git a/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/checksums/kaniko-1.25.15-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/checksums/kaniko-1.25.15-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..b47c47ad874f --- /dev/null +++ b/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/checksums/kaniko-1.25.15-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +83966516d722391a19c356b0b51c32064949d63f3271f2fdd93d38692e268950 kaniko-1.25.15-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/checksums/kaniko-1.25.15-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/checksums/kaniko-1.25.15-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..a9d5be2cc720 --- /dev/null +++ b/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/checksums/kaniko-1.25.15-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +45e22c54277be3fde33d778edd4d3d34f4f020a1f235f01260239f2f6262a831 kaniko-1.25.15-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh index 1c69e0e48a5d..335c1c7c9ef7 100644 --- a/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -139,3 +139,40 @@ wait_for_log_entry() { return 1 fi } + +######################## +# Creates a secure temporary file containing the provided secret +# Arguments: +# $1 - secret to write to the temporary file +# Returns: +# String +######################### +credential_to_temp_file() { + local secret="$1" + local tmp_file + + # Use mktemp with a specific prefix for easier debugging if something lingers + if ! tmp_file=$(mktemp "${TMPDIR:-/tmp}/at.cred.XXXXXXXX"); then + echo "Error: Failed to create temp file" >&2 + return 1 + fi + + # Restrict permissions before writing the secret + chmod 0600 "$tmp_file" + # Write secret and ensure it's flushed to disk + printf "%s" "$secret" > "$tmp_file" + # Output the filename so the caller can capture it + echo "$tmp_file" +} + +######################## +# Cleans up temporary files created by credential_to_temp_file +# Arguments: +# None +# Returns: +# None +######################### +cleanup_credentials() { + debug "Cleaning up temporary files containing credentials" + rm -rf "${TMPDIR:-/tmp}"/at.cred.* +} diff --git a/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh index 1337f6c2dd59..b16efabd3230 100644 --- a/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/kaniko/1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -131,6 +131,7 @@ relativize() { # -d|--dir-mode - mode for files. # -u|--user - user # -g|--group - group +# -n|--no-dereference - do not follow symlinks (use for runtime root chown of daemon-writable dirs) # Returns: # None ######################### @@ -140,6 +141,7 @@ configure_permissions_ownership() { local file_mode="" local user="" local group="" + local follow_symlinks="yes" # Validate arguments shift 1 @@ -161,6 +163,9 @@ configure_permissions_ownership() { shift group="${1:?missing group}" ;; + -n | --no-dereference) + follow_symlinks="no" + ;; *) echo "Invalid command line flag $1" >&2 return 1 @@ -169,22 +174,29 @@ configure_permissions_ownership() { shift done + # -L: follow symlinks and emits the target path + # This is dangerous at runtime, given a co-located lower-privileged process with write access + # to the target path can redirect the chown/chmod to arbitrary paths. Example: + # Lower-privileged process run: ln -s /etc /tmp/etc + # Then, setup.sh runs: configure_permissions_ownership --dir-mode 775 /tmp + local find_L_flag=(); [[ "$follow_symlinks" == "yes" ]] && find_L_flag=("-L") + # -h: changes symlink inode ownership without touching the target. + local chown_flags=(); [[ "$follow_symlinks" == "no" ]] && chown_flags=("-h") read -r -a filepaths <<<"$paths" for p in "${filepaths[@]}"; do if [[ -e "$p" ]]; then - find -L "$p" -printf "" if [[ -n $dir_mode ]]; then - find -L "$p" -type d ! -perm "$dir_mode" -print0 | xargs -r -0 chmod "$dir_mode" + find "${find_L_flag[@]}" "$p" -not -type l -type d ! -perm "$dir_mode" -print0 | xargs -r -0 chmod "$dir_mode" fi if [[ -n $file_mode ]]; then - find -L "$p" -type f ! -perm "$file_mode" -print0 | xargs -r -0 chmod "$file_mode" + find "${find_L_flag[@]}" "$p" -not -type l -type f ! -perm "$file_mode" -print0 | xargs -r -0 chmod "$file_mode" fi if [[ -n $user ]] && [[ -n $group ]]; then - find -L "$p" -print0 | xargs -r -0 chown "${user}:${group}" + find "${find_L_flag[@]}" "$p" -print0 | xargs -r -0 chown "${chown_flags[@]}" "${user}:${group}" elif [[ -n $user ]] && [[ -z $group ]]; then - find -L "$p" -print0 | xargs -r -0 chown "${user}" + find "${find_L_flag[@]}" "$p" -print0 | xargs -r -0 chown "${chown_flags[@]}" "${user}" elif [[ -z $user ]] && [[ -n $group ]]; then - find -L "$p" -print0 | xargs -r -0 chgrp "${group}" + find "${find_L_flag[@]}" "$p" -print0 | xargs -r -0 chgrp "${chown_flags[@]}" "${group}" fi else stderr_print "$p does not exist"