diff --git a/bitnami/wildfly/27/debian-11/Dockerfile b/bitnami/wildfly/27/debian-11/Dockerfile index 3756f1d7134b..eccbf2787d92 100644 --- a/bitnami/wildfly/27/debian-11/Dockerfile +++ b/bitnami/wildfly/27/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-17T01:06:32Z" \ + org.opencontainers.image.created="2023-04-19T15:41:20Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="27.0.1-debian-11-r40" \ + org.opencontainers.image.ref.name="27.0.1-debian-11-r41" \ org.opencontainers.image.title="wildfly" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="27.0.1" @@ -23,9 +23,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libaio1 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "java-11.0.18-10-4-linux-${OS_ARCH}-debian-11" \ - "wildfly-27.0.1-9-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ + "java-17.0.6-10-4-linux-${OS_ARCH}-debian-11" \ + "wildfly-27.0.1-10-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -47,7 +46,7 @@ RUN /opt/bitnami/scripts/wildfly/postunpack.sh ENV APP_VERSION="27.0.1" \ BITNAMI_APP_NAME="wildfly" \ JAVA_HOME="/opt/bitnami/java" \ - PATH="/opt/bitnami/java/bin:/opt/bitnami/wildfly/bin:/opt/bitnami/common/bin:$PATH" \ + PATH="/opt/bitnami/java/bin:/opt/bitnami/wildfly/bin:$PATH" \ WILDFLY_HOME="/home/wildfly" EXPOSE 8080 9990 diff --git a/bitnami/wildfly/27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wildfly/27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a9db26515d9a..1891dd0c20be 100644 --- a/bitnami/wildfly/27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/wildfly/27/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,20 +1,14 @@ { - "gosu": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "1.16.0-5" - }, "java": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.0.18-10-4" + "version": "17.0.6-10-4" }, "wildfly": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "27.0.1-9" + "version": "27.0.1-10" } } \ No newline at end of file diff --git a/bitnami/wildfly/27/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/wildfly/27/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/wildfly/27/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/wildfly/27/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/wildfly/27/debian-11/rootfs/opt/bitnami/scripts/libwildfly.sh b/bitnami/wildfly/27/debian-11/rootfs/opt/bitnami/scripts/libwildfly.sh index fb6785d5acba..b4e588339a8d 100644 --- a/bitnami/wildfly/27/debian-11/rootfs/opt/bitnami/scripts/libwildfly.sh +++ b/bitnami/wildfly/27/debian-11/rootfs/opt/bitnami/scripts/libwildfly.sh @@ -155,7 +155,7 @@ wildfly_add_user() { "-sc" "$WILDFLY_CONF_DIR" # Location of the server config directory ) if am_i_root; then - debug_execute gosu "$WILDFLY_DAEMON_USER" "${WILDFLY_BIN_DIR}/add-user.sh" "${args[@]}" + debug_execute run_as_user "$WILDFLY_DAEMON_USER" "${WILDFLY_BIN_DIR}/add-user.sh" "${args[@]}" else debug_execute "${WILDFLY_BIN_DIR}/add-user.sh" "${args[@]}" fi diff --git a/bitnami/wildfly/27/debian-11/rootfs/opt/bitnami/scripts/wildfly/run.sh b/bitnami/wildfly/27/debian-11/rootfs/opt/bitnami/scripts/wildfly/run.sh index 665a9df4d46c..a9d002e77887 100755 --- a/bitnami/wildfly/27/debian-11/rootfs/opt/bitnami/scripts/wildfly/run.sh +++ b/bitnami/wildfly/27/debian-11/rootfs/opt/bitnami/scripts/wildfly/run.sh @@ -19,7 +19,7 @@ declare -a args=("-Djboss.server.data.dir=${WILDFLY_DATA_DIR}" "$@") info "** Starting WildFly **" if am_i_root; then - exec gosu "$WILDFLY_DAEMON_USER" "${EXEC[@]}" "${args[@]}" + exec_as_user "$WILDFLY_DAEMON_USER" "${EXEC[@]}" "${args[@]}" else exec "${EXEC[@]}" "${args[@]}" fi