From 968167d52c4d6c328067b49f85c6fd79c7ef90ed Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Apr 2023 01:19:31 +0200 Subject: [PATCH] [bitnami/parse-dashboard] Release 5.0.0-debian-11-r52 (#30998) Signed-off-by: Bitnami Containers --- .../parse-dashboard/5/debian-11/Dockerfile | 7 +- .../opt/bitnami/.bitnami_components.json | 6 -- .../prebuildfs/opt/bitnami/scripts/libos.sh | 95 +++++++++++++++++++ .../bitnami/scripts/parse-dashboard/run.sh | 2 +- 4 files changed, 99 insertions(+), 11 deletions(-) diff --git a/bitnami/parse-dashboard/5/debian-11/Dockerfile b/bitnami/parse-dashboard/5/debian-11/Dockerfile index 6377ca3a2aff..a924891dc63e 100644 --- a/bitnami/parse-dashboard/5/debian-11/Dockerfile +++ b/bitnami/parse-dashboard/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-16T22:29:05Z" \ + org.opencontainers.image.created="2023-04-19T22:56:05Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.0.0-debian-11-r51" \ + org.opencontainers.image.ref.name="5.0.0-debian-11-r52" \ org.opencontainers.image.title="parse-dashboard" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="5.0.0" @@ -25,7 +25,6 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "python-3.8.16-9-linux-${OS_ARCH}-debian-11" \ "node-16.20.0-1-linux-${OS_ARCH}-debian-11" \ "parse-dashboard-5.0.0-7-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 \ @@ -45,7 +44,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/parse-dashboard/postunpack.sh ENV APP_VERSION="5.0.0" \ BITNAMI_APP_NAME="parse-dashboard" \ - PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/parse-dashboard/bin:/opt/bitnami/common/bin:$PATH" + PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/parse-dashboard/bin:$PATH" EXPOSE 3000 4040 diff --git a/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 2c13d4077f93..afcdcb97b37d 100644 --- a/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/parse-dashboard/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" - }, "node": { "arch": "amd64", "distro": "debian-11", diff --git a/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/parse-dashboard/5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/parse-dashboard/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/parse-dashboard/5/debian-11/rootfs/opt/bitnami/scripts/parse-dashboard/run.sh b/bitnami/parse-dashboard/5/debian-11/rootfs/opt/bitnami/scripts/parse-dashboard/run.sh index 67a66872fdd2..5f4eb216d056 100755 --- a/bitnami/parse-dashboard/5/debian-11/rootfs/opt/bitnami/scripts/parse-dashboard/run.sh +++ b/bitnami/parse-dashboard/5/debian-11/rootfs/opt/bitnami/scripts/parse-dashboard/run.sh @@ -24,7 +24,7 @@ if ! is_boolean_yes "$PARSE_DASHBOARD_ENABLE_HTTPS"; then fi if am_i_root; then - exec gosu "$PARSE_DASHBOARD_DAEMON_USER" "node" "${PARSE_DASHBOARD_BASE_DIR}/bin/parse-dashboard" "${parse_dashboard_args[@]}" "$@" + exec_as_user "$PARSE_DASHBOARD_DAEMON_USER" "node" "${PARSE_DASHBOARD_BASE_DIR}/bin/parse-dashboard" "${parse_dashboard_args[@]}" "$@" else exec node "${PARSE_DASHBOARD_BASE_DIR}/bin/parse-dashboard" "${parse_dashboard_args[@]}" "$@" fi