From b28f6a209d7f91a3bef91e1da22a5d6c8ec2090f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 19 Apr 2023 22:18:32 +0200 Subject: [PATCH] [bitnami/couchdb] Release 3.3.1-debian-11-r32 (#30900) Signed-off-by: Bitnami Containers --- bitnami/couchdb/3/debian-11/Dockerfile | 9 +- .../opt/bitnami/.bitnami_components.json | 10 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 95 +++++++++++++++++++ .../rootfs/opt/bitnami/scripts/couchdb/run.sh | 2 +- .../rootfs/opt/bitnami/scripts/libcouchdb.sh | 2 +- 5 files changed, 103 insertions(+), 15 deletions(-) diff --git a/bitnami/couchdb/3/debian-11/Dockerfile b/bitnami/couchdb/3/debian-11/Dockerfile index a0d1f8cbccb6..caef50b8d3c3 100644 --- a/bitnami/couchdb/3/debian-11/Dockerfile +++ b/bitnami/couchdb/3/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-16T16:51:23Z" \ + org.opencontainers.image.created="2023-04-19T19:46:41Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.3.1-debian-11-r31" \ + org.opencontainers.image.ref.name="3.3.1-debian-11-r32" \ org.opencontainers.image.title="couchdb" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.3.1" @@ -22,9 +22,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libgcc-s1 libicu67 libssl1.1 libstdc++6 libtinfo6 procps zlib1g 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" \ - "ini-file-1.4.5-4-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.6-6-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.5-5-linux-${OS_ARCH}-debian-11" \ "erlang-25.3.0-3-linux-${OS_ARCH}-debian-11" \ "couchdb-3.3.1-7-linux-${OS_ARCH}-debian-11" \ ) && \ diff --git a/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index af0b2599ab70..16d7b9b89647 100644 --- a/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -11,22 +11,16 @@ "type": "NAMI", "version": "25.3.0-3" }, - "gosu": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "1.16.0-5" - }, "ini-file": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.5-4" + "version": "1.4.5-5" }, "wait-for-port": { "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/couchdb/3/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/couchdb/3/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/couchdb/3/debian-11/rootfs/opt/bitnami/scripts/couchdb/run.sh b/bitnami/couchdb/3/debian-11/rootfs/opt/bitnami/scripts/couchdb/run.sh index 11913c32b923..a7c2119dba04 100755 --- a/bitnami/couchdb/3/debian-11/rootfs/opt/bitnami/scripts/couchdb/run.sh +++ b/bitnami/couchdb/3/debian-11/rootfs/opt/bitnami/scripts/couchdb/run.sh @@ -17,7 +17,7 @@ set -o pipefail info "** Starting CouchDB **" if am_i_root; then - exec gosu "$COUCHDB_DAEMON_USER" "${COUCHDB_BIN_DIR}/couchdb" + exec_as_user "$COUCHDB_DAEMON_USER" "${COUCHDB_BIN_DIR}/couchdb" else exec "${COUCHDB_BIN_DIR}/couchdb" fi diff --git a/bitnami/couchdb/3/debian-11/rootfs/opt/bitnami/scripts/libcouchdb.sh b/bitnami/couchdb/3/debian-11/rootfs/opt/bitnami/scripts/libcouchdb.sh index 5852f4f61db4..c04cecc6e464 100644 --- a/bitnami/couchdb/3/debian-11/rootfs/opt/bitnami/scripts/libcouchdb.sh +++ b/bitnami/couchdb/3/debian-11/rootfs/opt/bitnami/scripts/libcouchdb.sh @@ -194,7 +194,7 @@ couchdb_conf_set() { couchdb_start_bg() { info "Starting CouchDB in background..." local start_command=("${COUCHDB_BIN_DIR}/couchdb") - am_i_root && start_command=("gosu" "$COUCHDB_DAEMON_USER" "${start_command[@]}") + am_i_root && start_command=("run_as_user" "$COUCHDB_DAEMON_USER" "${start_command[@]}") debug_execute "${start_command[@]}" & wait-for-port "${COUCHDB_PORT_NUMBER:-5984}" wait-for-port "${COUCHDB_CLUSTER_PORT_NUMBER:-9100}"