From be4754bcd7bed4ceca2c9c20aa3eead9f8478f43 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Apr 2023 02:50:30 +0200 Subject: [PATCH] [bitnami/jasperreports] Release 8.1.0-debian-11-r73 (#31029) Signed-off-by: Bitnami Containers --- bitnami/jasperreports/8/debian-11/Dockerfile | 9 +- .../opt/bitnami/.bitnami_components.json | 10 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 95 +++++++++++++++++++ .../opt/bitnami/scripts/libjasperreports.sh | 6 +- .../opt/bitnami/scripts/libmysqlclient.sh | 6 +- .../rootfs/opt/bitnami/scripts/libtomcat.sh | 4 +- .../rootfs/opt/bitnami/scripts/tomcat/run.sh | 3 +- .../opt/bitnami/scripts/tomcat/start.sh | 2 +- 8 files changed, 111 insertions(+), 24 deletions(-) diff --git a/bitnami/jasperreports/8/debian-11/Dockerfile b/bitnami/jasperreports/8/debian-11/Dockerfile index aaef3441abf8..673bb078be50 100644 --- a/bitnami/jasperreports/8/debian-11/Dockerfile +++ b/bitnami/jasperreports/8/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-16T22:07:05Z" \ + org.opencontainers.image.created="2023-04-19T23:31:18Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="8.1.0-debian-11-r72" \ + org.opencontainers.image.ref.name="8.1.0-debian-11-r73" \ org.opencontainers.image.title="jasperreports" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="8.1.0" @@ -24,12 +24,11 @@ RUN install_packages acl ca-certificates curl fontconfig git libaudit1 libbsd0 l RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "java-1.8.362-4-linux-${OS_ARCH}-debian-11" \ - "tomcat-9.0.73-3-linux-${OS_ARCH}-debian-11" \ + "tomcat-9.0.74-0-linux-${OS_ARCH}-debian-11" \ "postgresql-client-11.19.0-4-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.6.12-4-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-5-linux-${OS_ARCH}-debian-11" \ "jasperreports-8.1.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 \ diff --git a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index be91c47af08d..c905ca0cefcf 100644 --- a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jasperreports/8/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" - }, "jasperreports": { "arch": "amd64", "distro": "debian-11", @@ -33,12 +27,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-4" + "version": "1.0.5-5" }, "tomcat": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "9.0.73-3" + "version": "9.0.74-0" } } \ No newline at end of file diff --git a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/jasperreports/8/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/jasperreports/8/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/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libjasperreports.sh b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libjasperreports.sh index 240d9e11e2f2..b6aa7a09ef28 100644 --- a/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libjasperreports.sh +++ b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libjasperreports.sh @@ -249,7 +249,7 @@ jasperreports_run_install_scripts() { # We set "y" to accept a warning on the keystore files if am_i_root; then - echo "y" | debug_execute gosu "$JASPERREPORTS_DAEMON_USER" "${JASPERREPORTS_CONF_DIR}/js-ant" "import-minimal-ce" + echo "y" | debug_execute run_as_user "$JASPERREPORTS_DAEMON_USER" "${JASPERREPORTS_CONF_DIR}/js-ant" "import-minimal-ce" else echo "y" | debug_execute "${JASPERREPORTS_CONF_DIR}/js-ant" "import-minimal-ce" @@ -274,7 +274,7 @@ jasperreports_run_deployment_scripts() { # During the deployment, it will copy one library file to the tomcat lib folder. We need to temporarily grant write permissions # for the installer to finish successfully. We restore the initial permissions after the operation chmod o+w "$BITNAMI_ROOT_DIR/tomcat/lib" - debug_execute gosu "$JASPERREPORTS_DAEMON_USER" "${JASPERREPORTS_CONF_DIR}/js-ant" "deploy-webapp-ce" + debug_execute run_as_user "$JASPERREPORTS_DAEMON_USER" "${JASPERREPORTS_CONF_DIR}/js-ant" "deploy-webapp-ce" chmod o-w "$BITNAMI_ROOT_DIR/tomcat/lib" else debug_execute "${JASPERREPORTS_CONF_DIR}/js-ant" "deploy-webapp-ce" @@ -298,7 +298,7 @@ jasperreports_run_upgrade_scripts() { info "Running upgrade script" cd "${JASPERREPORTS_CONF_DIR}" || exit if am_i_root; then - debug_execute gosu "$JASPERREPORTS_DAEMON_USER" "${JASPERREPORTS_CONF_DIR}/js-upgrade-samedb-ce.sh" + debug_execute run_as_user "$JASPERREPORTS_DAEMON_USER" "${JASPERREPORTS_CONF_DIR}/js-upgrade-samedb-ce.sh" else debug_execute "${JASPERREPORTS_CONF_DIR}/js-upgrade-samedb-ce.sh" diff --git a/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh index f63dea741844..c8bc278d0266 100644 --- a/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/jasperreports/8/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/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libtomcat.sh b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libtomcat.sh index e4be4ab8e184..64218cce29b2 100644 --- a/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libtomcat.sh +++ b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/libtomcat.sh @@ -215,7 +215,7 @@ tomcat_start_bg() { info "Starting Tomcat in background" local start_error=0 if am_i_root; then - debug_execute gosu "$TOMCAT_DAEMON_USER" "${TOMCAT_BIN_DIR}/startup.sh" || start_error="$?" + debug_execute run_as_user "$TOMCAT_DAEMON_USER" "${TOMCAT_BIN_DIR}/startup.sh" || start_error="$?" else debug_execute "${TOMCAT_BIN_DIR}/startup.sh" || start_error="$?" fi @@ -246,7 +246,7 @@ tomcat_stop() { # In addition, force the shutdown if it did not stop in time to ensure that the shutdown (almost) never fails local tomcat_shutdown_timeout=10 if am_i_root; then - debug_execute gosu "$TOMCAT_DAEMON_USER" "${TOMCAT_BIN_DIR}/shutdown.sh" "$tomcat_shutdown_timeout" -force || stop_error="$?" + debug_execute run_as_user "$TOMCAT_DAEMON_USER" "${TOMCAT_BIN_DIR}/shutdown.sh" "$tomcat_shutdown_timeout" -force || stop_error="$?" else debug_execute "${TOMCAT_BIN_DIR}/shutdown.sh" "$tomcat_shutdown_timeout" -force || stop_error="$?" fi diff --git a/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/tomcat/run.sh b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/tomcat/run.sh index fc557e21f49d..c27d23217b06 100755 --- a/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/tomcat/run.sh +++ b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/tomcat/run.sh @@ -17,8 +17,7 @@ set -o pipefail info "** Starting Tomcat **" if am_i_root; then - exec gosu "$TOMCAT_DAEMON_USER" "${TOMCAT_BIN_DIR}/catalina.sh" run "$@" + exec_as_user "$TOMCAT_DAEMON_USER" "${TOMCAT_BIN_DIR}/catalina.sh" run "$@" else exec "${TOMCAT_BIN_DIR}/catalina.sh" run "$@" fi - diff --git a/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/tomcat/start.sh b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/tomcat/start.sh index 26e09155f0ec..f6baef121455 100755 --- a/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/tomcat/start.sh +++ b/bitnami/jasperreports/8/debian-11/rootfs/opt/bitnami/scripts/tomcat/start.sh @@ -19,7 +19,7 @@ start_error=0 if is_tomcat_not_running; then if am_i_root; then - gosu "$TOMCAT_DAEMON_USER" "${TOMCAT_BIN_DIR}/startup.sh" || start_error="$?" + run_as_user "$TOMCAT_DAEMON_USER" "${TOMCAT_BIN_DIR}/startup.sh" || start_error="$?" else "${TOMCAT_BIN_DIR}/startup.sh" || start_error="$?" fi