diff --git a/bitnami/java/17/debian-11/Dockerfile b/bitnami/java/17/debian-11/Dockerfile index 26ad7c53a756..39aaaba6c319 100644 --- a/bitnami/java/17/debian-11/Dockerfile +++ b/bitnami/java/17/debian-11/Dockerfile @@ -4,13 +4,13 @@ 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-16T20:27:30Z" \ + org.opencontainers.image.created="2023-04-19T20:01:52Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="17.0.6-10-debian-11-r28" \ + org.opencontainers.image.ref.name="17.0.7-7-debian-11-r0" \ org.opencontainers.image.title="java" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="17.0.6-10" + org.opencontainers.image.version="17.0.7-7" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ @@ -22,8 +22,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libfontconfig libsqlite3-dev libssl-dev locales procps wget 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" \ - "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ + "java-17.0.7-7-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -48,12 +47,12 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ COPY rootfs / RUN /opt/bitnami/scripts/locales/add-extra-locales.sh RUN /opt/bitnami/scripts/java/postunpack.sh -ENV APP_VERSION="17.0.6-10" \ +ENV APP_VERSION="17.0.7-7" \ BITNAMI_APP_NAME="java" \ JAVA_HOME="/opt/bitnami/java" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ - PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH" + PATH="/opt/bitnami/java/bin:$PATH" ENTRYPOINT [ "/opt/bitnami/scripts/java/entrypoint.sh" ] CMD [ "bash" ] diff --git a/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 154eb31383ff..412f29ac5c73 100644 --- a/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,14 +1,8 @@ { - "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" } } \ No newline at end of file diff --git a/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/java/17/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/java/17/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/java/17/debian-11/tags-info.yaml b/bitnami/java/17/debian-11/tags-info.yaml index ad0cb2123bf0..011227ba38bb 100644 --- a/bitnami/java/17/debian-11/tags-info.yaml +++ b/bitnami/java/17/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "17" - 17-debian-11 -- 17.0.6-10 +- 17.0.7-7