From 7e5055314a74a61a69392fb2b197abfaaef23669 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Apr 2023 16:09:19 +0200 Subject: [PATCH] [bitnami/schema-registry] Release 7.2.5-debian-11-r3 (#31096) Signed-off-by: Bitnami Containers --- .../schema-registry/7.2/debian-11/Dockerfile | 9 +- .../opt/bitnami/.bitnami_components.json | 8 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 95 +++++++++++++++++++ .../bitnami/scripts/schema-registry/run.sh | 2 +- 4 files changed, 101 insertions(+), 13 deletions(-) diff --git a/bitnami/schema-registry/7.2/debian-11/Dockerfile b/bitnami/schema-registry/7.2/debian-11/Dockerfile index fc045b0f8378..749c7af61173 100644 --- a/bitnami/schema-registry/7.2/debian-11/Dockerfile +++ b/bitnami/schema-registry/7.2/debian-11/Dockerfile @@ -4,10 +4,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-04-17T12:36:58Z" \ + org.opencontainers.image.created="2023-04-20T13:26:26Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.2.5-debian-11-r2" \ + org.opencontainers.image.ref.name="7.2.5-debian-11-r3" \ org.opencontainers.image.title="schema-registry" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.2.5" @@ -23,9 +23,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl netcat procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "java-17.0.6-10-4-linux-${OS_ARCH}-debian-11" \ + "java-17.0.7-7-0-linux-${OS_ARCH}-debian-11" \ "schema-registry-7.2.5-1-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 \ @@ -47,7 +46,7 @@ RUN /opt/bitnami/scripts/schema-registry/postunpack.sh ENV APP_VERSION="7.2.5" \ BITNAMI_APP_NAME="schema-registry" \ JAVA_HOME="/opt/bitnami/java" \ - PATH="/opt/bitnami/java/bin:/opt/bitnami/schema-registry/bin:/opt/bitnami/common/bin:$PATH" + PATH="/opt/bitnami/java/bin:/opt/bitnami/schema-registry/bin:$PATH" USER 1001 ENTRYPOINT [ "/opt/bitnami/scripts/schema-registry/entrypoint.sh" ] diff --git a/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index fa67bb51827f..294333dff939 100644 --- a/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/schema-registry/7.2/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" - }, "java": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "17.0.6-10-4" + "version": "17.0.7-7-0" }, "schema-registry": { "arch": "amd64", diff --git a/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/schema-registry/7.2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/schema-registry/7.2/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/schema-registry/7.2/debian-11/rootfs/opt/bitnami/scripts/schema-registry/run.sh b/bitnami/schema-registry/7.2/debian-11/rootfs/opt/bitnami/scripts/schema-registry/run.sh index 359ad299a970..f0de82c0086c 100755 --- a/bitnami/schema-registry/7.2/debian-11/rootfs/opt/bitnami/scripts/schema-registry/run.sh +++ b/bitnami/schema-registry/7.2/debian-11/rootfs/opt/bitnami/scripts/schema-registry/run.sh @@ -20,7 +20,7 @@ __run_cmd="${SCHEMA_REGISTRY_BIN_DIR}/schema-registry-start" __run_flags=("$SCHEMA_REGISTRY_CONF_FILE" "$@") if am_i_root; then - exec gosu "$SCHEMA_REGISTRY_DAEMON_USER" "$__run_cmd" "${__run_flags[@]}" + exec_as_user "$SCHEMA_REGISTRY_DAEMON_USER" "$__run_cmd" "${__run_flags[@]}" else exec "$__run_cmd" "${__run_flags[@]}" fi