From 5ea39f6b1d002e859d3b6dc03a6c5077bbcbe3d4 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Apr 2023 19:29:37 +0200 Subject: [PATCH] [bitnami/minio] Release 2023.4.13-debian-11-r1 (#31121) Signed-off-by: Bitnami Containers --- bitnami/minio/2023/debian-11/Dockerfile | 10 +- .../opt/bitnami/.bitnami_components.json | 8 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 95 +++++++++++++++++++ .../rootfs/opt/bitnami/scripts/libminio.sh | 2 +- .../opt/bitnami/scripts/libminioclient.sh | 4 +- .../opt/bitnami/scripts/minio-client/run.sh | 2 +- .../rootfs/opt/bitnami/scripts/minio/run.sh | 2 +- 7 files changed, 106 insertions(+), 17 deletions(-) diff --git a/bitnami/minio/2023/debian-11/Dockerfile b/bitnami/minio/2023/debian-11/Dockerfile index 8267d3c2bf2d..37526a6de577 100644 --- a/bitnami/minio/2023/debian-11/Dockerfile +++ b/bitnami/minio/2023/debian-11/Dockerfile @@ -2,11 +2,12 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH -LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-04-17T15:36:11Z" \ +LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-04-20T17:07:08Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2023.4.13-debian-11-r0" \ + org.opencontainers.image.ref.name="2023.4.13-debian-11-r1" \ org.opencontainers.image.title="minio" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2023.4.13" @@ -22,10 +23,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl jq procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "wait-for-port-1.0.6-4-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.6-6-linux-${OS_ARCH}-debian-11" \ "minio-client-2023.4.12-0-linux-${OS_ARCH}-debian-11" \ "minio-2023.4.13-0-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 19108b8661d1..3c39536e5305 100644 --- a/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,10 +1,4 @@ { - "gosu": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "1.16.0-5" - }, "minio": { "arch": "amd64", "distro": "debian-11", @@ -21,6 +15,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-4" + "version": "1.0.6-6" } } \ No newline at end of file diff --git a/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/minio/2023/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -553,3 +553,98 @@ get_root_disk_device_id() { get_root_disk_size() { fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true } + +######################## +# Run command as a specific user and group (optional) +# Arguments: +# $1 - USER(:GROUP) to switch to +# $2..$n - command to execute +# Returns: +# Exit code of the specified command +######################### +run_as_user() { + run_chroot "$@" +} + +######################## +# Execute command as a specific user and group (optional), +# replacing the current process image +# Arguments: +# $1 - USER(:GROUP) to switch to +# $2..$n - command to execute +# Returns: +# Exit code of the specified command +######################### +exec_as_user() { + run_chroot --replace-process "$@" +} + +######################## +# Run a command using chroot +# Arguments: +# $1 - USER(:GROUP) to switch to +# $2..$n - command to execute +# Flags: +# -r | --replace-process - Replace the current process image (optional) +# Returns: +# Exit code of the specified command +######################### +run_chroot() { + local userspec + local user + local homedir + local replace=false + local -r cwd="$(pwd)" + + # Parse and validate flags + while [[ "$#" -gt 0 ]]; do + case "$1" in + -r | --replace-process) + replace=true + ;; + --) + shift + break + ;; + -*) + stderr_print "unrecognized flag $1" + return 1 + ;; + *) + break + ;; + esac + shift + done + + # Parse and validate arguments + if [[ "$#" -lt 2 ]]; then + echo "expected at least 2 arguments" + return 1 + else + userspec=$1 + shift + + # userspec can optionally include the group, so we parse the user + user=$(echo "$userspec" | cut -d':' -f1) + fi + + if ! am_i_root; then + error "Could not switch to '${userspec}': Operation not permitted" + return 1 + fi + + # Get the HOME directory for the user to switch, as chroot does + # not properly update this env and some scripts rely on it + homedir=$(eval echo "~${user}") + if [[ ! -d $homedir ]]; then + homedir="${HOME:-/}" + fi + + # Obtaining value for "$@" indirectly in order to properly support shell parameter expansion + if [[ "$replace" = true ]]; then + exec chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@" + else + chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@" + fi +} \ No newline at end of file diff --git a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminio.sh b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminio.sh index cbf08fde4763..b53bb6e2c344 100644 --- a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminio.sh +++ b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminio.sh @@ -157,7 +157,7 @@ minio_start_bg() { is_minio_running && return info "Starting MinIO in background..." if am_i_root; then - debug_execute gosu "$MINIO_DAEMON_USER" "${exec}" "${args[@]}" & + debug_execute run_as_user "$MINIO_DAEMON_USER" "${exec}" "${args[@]}" & else debug_execute "${exec}" "${args[@]}" & fi diff --git a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminioclient.sh b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminioclient.sh index 6eb107ab1037..f7d02daf429a 100644 --- a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminioclient.sh +++ b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminioclient.sh @@ -35,7 +35,7 @@ minio_client_execute() { exec=$(command -v mc) if am_i_root; then - gosu "$MINIO_DAEMON_USER" "${exec}" "${args[@]}" + run_as_user "$MINIO_DAEMON_USER" "${exec}" "${args[@]}" else "${exec}" "${args[@]}" fi @@ -55,7 +55,7 @@ minio_client_execute_timeout() { exec=$(command -v mc) if am_i_root; then - timeout 5s gosu "$MINIO_DAEMON_USER" "${exec}" "${args[@]}" + timeout 5s run_as_user "$MINIO_DAEMON_USER" "${exec}" "${args[@]}" else timeout 5s "${exec}" "${args[@]}" fi diff --git a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio-client/run.sh b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio-client/run.sh index f149715b30c7..c248c35b874b 100755 --- a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio-client/run.sh +++ b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio-client/run.sh @@ -20,7 +20,7 @@ EXEC=$(command -v mc) ARGS=("--config-dir" "${MINIO_CLIENT_CONF_DIR}" "$@") if am_i_root; then - exec gosu "${MINIO_CLIENT_DAEMON_USER}" "${EXEC}" "${ARGS[@]}" + exec_as_user "${MINIO_CLIENT_DAEMON_USER}" "${EXEC}" "${ARGS[@]}" else exec "${EXEC}" "${ARGS[@]}" fi diff --git a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/run.sh b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/run.sh index 6f48a12d564b..402118f9b722 100755 --- a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/run.sh +++ b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/run.sh @@ -35,7 +35,7 @@ fi info "** Starting MinIO **" if am_i_root; then - exec gosu "${MINIO_DAEMON_USER}" "${EXEC}" "${ARGS[@]}" + exec_as_user "${MINIO_DAEMON_USER}" "${EXEC}" "${ARGS[@]}" else exec "${EXEC}" "${ARGS[@]}" fi