From 15e2168bd350d3887a141a9dcc2fda871c587491 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Apr 2023 01:21:12 +0200 Subject: [PATCH] [bitnami/pgbouncer] Release 1.18.0-debian-11-r41 (#31002) Signed-off-by: Bitnami Containers --- bitnami/pgbouncer/1/debian-11/Dockerfile | 9 +- .../opt/bitnami/.bitnami_components.json | 10 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 95 +++++++++++++++++++ .../opt/bitnami/scripts/libpgbouncer.sh | 4 +- .../opt/bitnami/scripts/pgbouncer-env.sh | 4 +- .../opt/bitnami/scripts/pgbouncer/run.sh | 2 +- 6 files changed, 106 insertions(+), 18 deletions(-) diff --git a/bitnami/pgbouncer/1/debian-11/Dockerfile b/bitnami/pgbouncer/1/debian-11/Dockerfile index 04a4569b44c7..64bf35104a81 100644 --- a/bitnami/pgbouncer/1/debian-11/Dockerfile +++ b/bitnami/pgbouncer/1/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-16T22:22:45Z" \ + org.opencontainers.image.created="2023-04-19T23:04:11Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.18.0-debian-11-r40" \ + org.opencontainers.image.ref.name="1.18.0-debian-11-r41" \ org.opencontainers.image.title="pgbouncer" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.18.0" @@ -22,10 +22,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libaudit1 libbsd0 libc-ares2 libcap-ng0 libedit2 libevent-2.1-7 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpam0g libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales 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" \ + "wait-for-port-1.0.6-6-linux-${OS_ARCH}-debian-11" \ "postgresql-client-14.7.0-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" \ + "ini-file-1.4.5-5-linux-${OS_ARCH}-debian-11" \ "pgbouncer-1.18.0-6-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8edee2d984e4..69687fb36111 100644 --- a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,15 +1,9 @@ { - "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" }, "pgbouncer": { "arch": "amd64", @@ -27,6 +21,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/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/pgbouncer/1/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/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh index fe7132691f0b..e5692ba146c5 100644 --- a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh +++ b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh @@ -179,8 +179,8 @@ pgbouncer_initialize() { info "Configuring credentials" # Create credentials file if ! pgbouncer_is_file_external "userlist.txt"; then - echo "\"$POSTGRESQL_USERNAME\" \"$POSTGRESQL_PASSWORD\"" >"$PGBOUNCER_AUTH_FILE" - echo "$PGBOUNCER_USERLIST" >>"$PGBOUNCER_AUTH_FILE" + echo "\"$POSTGRESQL_USERNAME\" \"$POSTGRESQL_PASSWORD\"" > "$PGBOUNCER_AUTH_FILE" + echo "$PGBOUNCER_USERLIST" >> "$PGBOUNCER_AUTH_FILE" else debug "User list file mounted externally, skipping configuration" fi diff --git a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh index 722e7dae4125..e26e18dac59f 100644 --- a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh +++ b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh @@ -72,9 +72,9 @@ pgbouncer_env_vars=( POSTGRESQL_DATABASE POSTGRESQL_HOST POSTGRESQL_PORT - PGBOUNCER_USERLIST PGBOUNCER_SET_DATABASE_USER PGBOUNCER_SET_DATABASE_PASSWORD + PGBOUNCER_USERLIST PGBOUNCER_CONNECT_QUERY PGBOUNCER_FORCE_INITSCRIPTS PGBOUNCER_SOCKET_DIR @@ -169,9 +169,9 @@ export POSTGRESQL_PASSWORD="${POSTGRESQL_PASSWORD:-}" export POSTGRESQL_DATABASE="${POSTGRESQL_DATABASE:-postgres}" export POSTGRESQL_HOST="${POSTGRESQL_HOST:-postgresql}" export POSTGRESQL_PORT="${POSTGRESQL_PORT:-5432}" -export PGBOUNCER_USERLIST="${PGBOUNCER_USERLIST:-}" export PGBOUNCER_SET_DATABASE_USER="${PGBOUNCER_SET_DATABASE_USER:-no}" export PGBOUNCER_SET_DATABASE_PASSWORD="${PGBOUNCER_SET_DATABASE_PASSWORD:-no}" +export PGBOUNCER_USERLIST="${PGBOUNCER_USERLIST:-}" export PGBOUNCER_CONNECT_QUERY="${PGBOUNCER_CONNECT_QUERY:-}" export PGBOUNCER_FORCE_INITSCRIPTS="${PGBOUNCER_FORCE_INITSCRIPTS:-false}" diff --git a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer/run.sh b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer/run.sh index be23adcfdeda..7007fd746ea2 100755 --- a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer/run.sh +++ b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer/run.sh @@ -28,7 +28,7 @@ flags+=("$@") info "** Starting PgBouncer **" if am_i_root; then - exec gosu "$PGBOUNCER_DAEMON_USER" "$cmd" "${flags[@]}" + exec_as_user "$PGBOUNCER_DAEMON_USER" "$cmd" "${flags[@]}" else exec "$cmd" "${flags[@]}" fi