diff --git a/bitnami/rabbitmq/3.10/debian-11/Dockerfile b/bitnami/rabbitmq/3.10/debian-11/Dockerfile index 8ed6e7718bc1..23b179c90eab 100644 --- a/bitnami/rabbitmq/3.10/debian-11/Dockerfile +++ b/bitnami/rabbitmq/3.10/debian-11/Dockerfile @@ -3,10 +3,10 @@ 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-17T00:32:07Z" \ + org.opencontainers.image.created="2023-04-20T01:15:14Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.10.20-debian-11-r7" \ + org.opencontainers.image.ref.name="3.10.20-debian-11-r8" \ org.opencontainers.image.title="rabbitmq" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.10.20" @@ -15,7 +15,7 @@ ENV HOME="/opt/bitnami/rabbitmq/.rabbitmq" \ OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ OS_NAME="linux" \ - PATH="/opt/bitnami/common/bin:/opt/bitnami/erlang/bin:/opt/bitnami/rabbitmq/sbin:$PATH" + PATH="/opt/bitnami/erlang/bin:/opt/bitnami/rabbitmq/sbin:$PATH" COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -23,7 +23,6 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libgcc-s1 libssl1.1 libstdc++6 libtinfo6 locales procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ "erlang-25.3.0-3-linux-${OS_ARCH}-debian-11" \ "rabbitmq-3.10.20-1-linux-${OS_ARCH}-debian-11" \ ) && \ diff --git a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 9c6ca8b1c7e6..a503abd232ca 100644 --- a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -5,12 +5,6 @@ "type": "NAMI", "version": "25.3.0-3" }, - "gosu": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "1.16.0-5" - }, "rabbitmq": { "arch": "amd64", "distro": "debian-11", diff --git a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/rabbitmq/3.10/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/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh b/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh index 753efbd08509..31bbbc2c5aa7 100644 --- a/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh +++ b/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/librabbitmq.sh @@ -632,7 +632,7 @@ rabbitmq_start_bg() { is_rabbitmq_running && return info "Starting RabbitMQ in background..." local start_command=("$RABBITMQ_BIN_DIR/rabbitmq-server") - am_i_root && start_command=("gosu" "$RABBITMQ_DAEMON_USER" "${start_command[@]}") + am_i_root && start_command=("run_as_user" "$RABBITMQ_DAEMON_USER" "${start_command[@]}") debug_execute "${start_command[@]}" & export RABBITMQ_PID="$!" diff --git a/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh b/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh index c422a8e060db..6202ff6033df 100755 --- a/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh +++ b/bitnami/rabbitmq/3.10/debian-11/rootfs/opt/bitnami/scripts/rabbitmq/run.sh @@ -52,7 +52,7 @@ fi info "** Starting RabbitMQ **" cd "$RABBITMQ_BASE_DIR" if am_i_root; then - exec gosu "$RABBITMQ_DAEMON_USER" "${RABBITMQ_BIN_DIR}/rabbitmq-server" + exec_as_user "$RABBITMQ_DAEMON_USER" "${RABBITMQ_BIN_DIR}/rabbitmq-server" else exec "${RABBITMQ_BIN_DIR}/rabbitmq-server" fi