From ddd902673f2b09b2d4398c08af1045027bfcc997 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Apr 2023 03:58:24 +0200 Subject: [PATCH] [bitnami/redmine] Release 5.0.5-debian-11-r13 (#31043) Signed-off-by: Bitnami Containers --- bitnami/redmine/5/debian-11/Dockerfile | 5 +- .../opt/bitnami/.bitnami_components.json | 6 -- .../prebuildfs/opt/bitnami/scripts/libos.sh | 95 +++++++++++++++++++ .../opt/bitnami/scripts/libmysqlclient.sh | 6 +- .../rootfs/opt/bitnami/scripts/libredmine.sh | 2 +- 5 files changed, 101 insertions(+), 13 deletions(-) diff --git a/bitnami/redmine/5/debian-11/Dockerfile b/bitnami/redmine/5/debian-11/Dockerfile index 556bed8d5531..8c080abc472e 100644 --- a/bitnami/redmine/5/debian-11/Dockerfile +++ b/bitnami/redmine/5/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:29:07Z" \ + org.opencontainers.image.created="2023-04-20T01:15:16Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.0.5-debian-11-r12" \ + org.opencontainers.image.ref.name="5.0.5-debian-11-r13" \ org.opencontainers.image.title="redmine" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="5.0.5" @@ -27,7 +27,6 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "postgresql-client-15.2.0-4-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.6.12-4-linux-${OS_ARCH}-debian-11" \ "redmine-5.0.5-3-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/redmine/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index fd6673fde4de..4da3867bc1bf 100644 --- a/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/redmine/5/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" - }, "mysql-client": { "arch": "amd64", "distro": "debian-11", diff --git a/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/redmine/5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/redmine/5/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/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh index f63dea741844..c8bc278d0266 100644 --- a/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -447,7 +447,7 @@ mysql_stop() { mysql_install_db() { local command="${DB_BIN_DIR}/mysql_install_db" local -a args=("--defaults-file=${DB_CONF_FILE}" "--basedir=${DB_BASE_DIR}" "--datadir=${DB_DATA_DIR}") - + # Add flags specified via the 'DB_EXTRA_FLAGS' environment variable read -r -a db_extra_flags <<< "$(mysql_extra_flags)" [[ "${#db_extra_flags[@]}" -gt 0 ]] && args+=("${db_extra_flags[@]}") @@ -586,9 +586,9 @@ mysql_ensure_user_exists() { auth_string="identified via pam using '$DB_FLAVOR'" elif [[ -n "$password" ]]; then if [[ -n "$auth_plugin" ]]; then - auth_string="identified with $auth_plugin by \"$password\"" + auth_string="identified with $auth_plugin by '$password'" else - auth_string="identified by \"$password\"" + auth_string="identified by '$password'" fi fi debug "creating database user \'$user\'" diff --git a/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh b/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh index 3917645b6970..b67f76cb0ca3 100644 --- a/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh +++ b/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh @@ -394,7 +394,7 @@ redmine_bundle_execute_print_output() { # Avoid creating unnecessary cache files at initialization time local -a cmd=("bundle" "exec" "$@") # Run as application user to avoid having to change permissions/ownership afterwards - am_i_root && cmd=("gosu" "$REDMINE_DAEMON_USER" "${cmd[@]}") + am_i_root && cmd=("run_as_user" "$REDMINE_DAEMON_USER" "${cmd[@]}") ( export RAILS_ENV="$REDMINE_ENV" cd "$REDMINE_BASE_DIR" || false