diff --git a/bitnami/pytorch/2/debian-11/Dockerfile b/bitnami/pytorch/2/debian-11/Dockerfile index 8a0bd9c15cab..3ab8250f7cf1 100644 --- a/bitnami/pytorch/2/debian-11/Dockerfile +++ b/bitnami/pytorch/2/debian-11/Dockerfile @@ -2,11 +2,12 @@ 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-18T14:10:38Z" \ +LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-04-21T14:57:28Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.0.0-debian-11-r5" \ + org.opencontainers.image.ref.name="2.0.0-debian-11-r6" \ org.opencontainers.image.title="pytorch" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.0.0" @@ -22,9 +23,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgomp1 libgssapi-krb5-2 libjemalloc2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 numactl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "python-3.8.16-9-linux-${OS_ARCH}-debian-11" \ + "python-3.8.16-11-linux-${OS_ARCH}-debian-11" \ "pytorch-2.0.0-0-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 +45,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/pytorch/postunpack.sh ENV APP_VERSION="2.0.0" \ BITNAMI_APP_NAME="pytorch" \ - PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:$PATH" + PATH="/opt/bitnami/python/bin:$PATH" WORKDIR /app USER 1001 diff --git a/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5132952f2e31..03d937be5036 100644 --- a/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/pytorch/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" - }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.8.16-9" + "version": "3.8.16-11" }, "pytorch": { "arch": "amd64", diff --git a/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/pytorch/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/pytorch/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