From d283c9917611d01aa6bdd413e166fea53b0fbcf8 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 17 Jun 2026 18:03:27 +0200 Subject: [PATCH] [bitnami/jmx-exporter] Release 1.6.0-debian-12-r0 (#94850) Signed-off-by: Bitnami Bot --- bitnami/jmx-exporter/1/debian-12/Dockerfile | 22 +++++------ ....6.0-0-linux-amd64-debian-12.tar.gz.sha256 | 1 + ....6.0-0-linux-arm64-debian-12.tar.gz.sha256 | 1 + ...9-11-1-linux-amd64-debian-12.tar.gz.sha256 | 1 + ...9-11-1-linux-arm64-debian-12.tar.gz.sha256 | 1 + .../prebuildfs/opt/bitnami/scripts/libfile.sh | 37 +++++++++++++++++++ .../prebuildfs/opt/bitnami/scripts/libfs.sh | 24 +++++++++--- .../prebuildfs/opt/bitnami/scripts/libos.sh | 2 +- .../opt/bitnami/scripts/libpersistence.sh | 10 ++--- .../opt/bitnami/scripts/libvalidations.sh | 2 +- .../opt/bitnami/scripts/libversion.sh | 33 +++++++++++++++++ 11 files changed, 110 insertions(+), 24 deletions(-) create mode 100644 bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jmx-exporter-1.6.0-0-linux-amd64-debian-12.tar.gz.sha256 create mode 100644 bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jmx-exporter-1.6.0-0-linux-arm64-debian-12.tar.gz.sha256 create mode 100644 bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-amd64-debian-12.tar.gz.sha256 create mode 100644 bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-arm64-debian-12.tar.gz.sha256 diff --git a/bitnami/jmx-exporter/1/debian-12/Dockerfile b/bitnami/jmx-exporter/1/debian-12/Dockerfile index c42be35e1c44..74604159c0aa 100644 --- a/bitnami/jmx-exporter/1/debian-12/Dockerfile +++ b/bitnami/jmx-exporter/1/debian-12/Dockerfile @@ -3,17 +3,17 @@ FROM docker.io/bitnami/minideb:bookworm -ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" +ARG DOWNLOADS_URL="https://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:30:38Z" \ + org.opencontainers.image.created="2026-06-17T15:51:37Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/jmx-exporter/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/jmx-exporter" \ org.opencontainers.image.title="jmx-exporter" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="1.5.0" + org.opencontainers.image.version="1.6.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -29,17 +29,17 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ "jre-17.0.19-11-1-linux-${OS_ARCH}-debian-12" \ - "jmx-exporter-1.5.0-0-linux-${OS_ARCH}-debian-12" \ + "jmx-exporter-1.6.0-0-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 ; \ + curl -SsLf "${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -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 chmod g+rwX /opt/bitnami @@ -47,9 +47,9 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true RUN chown -R 1001:1001 /opt/bitnami/jmx-exporter RUN uninstall_packages ca-certificates curl -ENV APP_VERSION="1.5.0" \ +ENV APP_VERSION="1.6.0" \ BITNAMI_APP_NAME="jmx-exporter" \ - IMAGE_REVISION="11" \ + IMAGE_REVISION="0" \ PATH="/opt/bitnami/java/bin:$PATH" EXPOSE 5556 diff --git a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jmx-exporter-1.6.0-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jmx-exporter-1.6.0-0-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..de7f20a1f99a --- /dev/null +++ b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jmx-exporter-1.6.0-0-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +1eb729b21b587af464128c0bf6466723ee6edb533657cbc8052d75705177cf0e jmx-exporter-1.6.0-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jmx-exporter-1.6.0-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jmx-exporter-1.6.0-0-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..e6a4e9412bd7 --- /dev/null +++ b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jmx-exporter-1.6.0-0-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +6bf98fe7d96182ab3df4fae7c3aca0150e6bca35a607c070b67bf5eec3eb4b5f jmx-exporter-1.6.0-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..5fa4e9253e4d --- /dev/null +++ b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +f0c743ea17d6bb58c1d132dd5b96e1f2d94ef055a12bd0c769b737cd41df98d2 jre-17.0.19-11-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..e904d564f5e4 --- /dev/null +++ b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/checksums/jre-17.0.19-11-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +d77ed8eca85b273fcb7b3152712beda317ba6f080fff141fb1341e4640aade22 jre-17.0.19-11-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh index 1c69e0e48a5d..335c1c7c9ef7 100644 --- a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/jmx-exporter/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/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh index 1337f6c2dd59..b16efabd3230 100644 --- a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/jmx-exporter/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" diff --git a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh @@ -170,7 +170,7 @@ ensure_user_exists() { if [[ -n "$home" ]]; then mkdir -p "$home" usermod -d "$home" "$user" >/dev/null 2>&1 - configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" + configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" -n fi } diff --git a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh index 18445e7d27fa..833ee5ab1d65 100644 --- a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -39,7 +39,7 @@ persist_app() { fi pushd "$install_dir" >/dev/null || exit local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder - local -r tmp_file="/tmp/perms.acl" + local -r acl_file="$(mktemp "${TMPDIR:-/tmp}"/acl.XXXXXXXXXX)" for file_to_persist in "${files_to_persist[@]}"; do if [[ ! -f "$file_to_persist" && ! -d "$file_to_persist" ]]; then error "Cannot persist '${file_to_persist}' because it does not exist" @@ -50,22 +50,22 @@ persist_app() { file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")" # Get original permissions for existing files, which will be applied later # Exclude the root directory with 'sed', to avoid issues when copying the entirety of it to a volume - getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$tmp_file" + getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$acl_file" # Copy directories to the volume ensure_dir_exists "$file_to_persist_destination_folder" cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder" # Restore permissions pushd "$persist_dir" >/dev/null || exit if am_i_root; then - setfacl --restore="$tmp_file" + setfacl --restore="$acl_file" else # When running as non-root, don't change ownership - setfacl --restore=<(grep -E -v '^# (owner|group):' "$tmp_file") + setfacl --restore=<(grep -E -v '^# (owner|group):' "$acl_file") fi popd >/dev/null || exit done popd >/dev/null || exit - rm -f "$tmp_file" + rm -f "$acl_file" # Install the persisted files into the installation directory, via symlinks restore_persisted_app "$@" } diff --git a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -20,7 +20,7 @@ ######################### is_int() { local -r int="${1:?missing value}" - if [[ "$int" =~ ^-?[0-9]+ ]]; then + if [[ "$int" =~ ^-?[0-9]+$ ]]; then true else false diff --git a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/jmx-exporter/1/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -49,3 +49,36 @@ get_sematic_version () { fi fi } + +######################## +# Compares two semantic versions +# Arguments: +# $1 - version1: first version to compare +# $2 - version2: second version to compare +# Returns: +# -1 if version1 is less than version2 +# 0 if version1 is equal to version2 +# 1 if version1 is greater than version2 +######################### +compare_semantic_versions() { + local version1="${1:?version1 is required}" + local version2="${2:?version2 is required}" + local major1 major2 minor1 minor2 patch1 patch2 + + major1="$(get_sematic_version "$version1" 1)" + major2="$(get_sematic_version "$version2" 1)" + minor1="$(get_sematic_version "$version1" 2)" + minor2="$(get_sematic_version "$version2" 2)" + patch1="$(get_sematic_version "$version1" 3)" + patch2="$(get_sematic_version "$version2" 3)" + + if [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -eq "$patch2" ]]; then + echo "0" + elif [[ "$major1" -lt "$major2" ]] || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -lt "$minor2" ]]; } || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -lt "$patch2" ]]; }; then + echo "-1" + else + echo "1" + fi +}