From 849f5373d11f8a6ab0e392e224c0986fc5cfe037 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Apr 2023 04:11:28 +0200 Subject: [PATCH] [bitnami/mxnet] Release 1.9.1-debian-11-r110 (#31046) Signed-off-by: Bitnami Containers --- bitnami/mxnet/1/debian-11/Dockerfile | 9 +- .../opt/bitnami/.bitnami_components.json | 8 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 95 +++++++++++++++++++ 3 files changed, 100 insertions(+), 12 deletions(-) diff --git a/bitnami/mxnet/1/debian-11/Dockerfile b/bitnami/mxnet/1/debian-11/Dockerfile index 5d5c415ff927..d169e9b154c7 100644 --- a/bitnami/mxnet/1/debian-11/Dockerfile +++ b/bitnami/mxnet/1/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-17T01:12:46Z" \ + org.opencontainers.image.created="2023-04-20T01:41:14Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.9.1-debian-11-r109" \ + org.opencontainers.image.ref.name="1.9.1-debian-11-r110" \ org.opencontainers.image.title="mxnet" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.9.1" @@ -22,9 +22,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libaec0 libaom0 libarmadillo10 libarpack2 libblas3 libbrotli1 libbsd0 libbz2-1.0 libcfitsio9 libcharls2 libcom-err2 libcrypt1 libcurl3-gnutls libdap27 libdapclient6v5 libdav1d4 libde265-0 libdeflate0 libepsilon1 libexpat1 libffi7 libfontconfig1 libfreetype6 libfreexl1 libfyba0 libgcc-s1 libgcrypt20 libgdal28 libgdcm3.0 libgeos-3.9.0 libgeos-c1v5 libgeotiff5 libgfortran5 libgif7 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhdf4-0-alt libhdf5-103-1 libhdf5-hl-100 libheif1 libhogweed6 libicu67 libidn2-0 libilmbase25 libjbig0 libjpeg62-turbo libjson-c5 libk5crypto3 libkeyutils1 libkmlbase1 libkmldom1 libkmlengine1 libkrb5-3 libkrb5support0 liblapack-dev liblapack3 liblcms2-2 libldap-2.4-2 libltdl7 liblzma5 libmariadb3 libmd0 libminizip1 libncursesw6 libnetcdf18 libnettle8 libnghttp2-14 libnorm1 libnsl2 libnspr4 libnss3 libnuma1 libodbc1 libogdi4.1 libomp-dev libopencv-core4.5 libopencv-highgui-dev libopencv-imgcodecs4.5 libopencv-imgproc4.5 libopenexr25 libopenjp2-7 libp11-kit0 libpcre3 libpgm-5.3-0 libpng16-16 libpoppler102 libpq5 libproj19 libprotobuf-dev libprotobuf23 libpsl5 libqhull8.0 libquadmath0 libreadline8 librtmp1 librttopo1 libsasl2-2 libsodium23 libspatialite7 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsuperlu5 libsz2 libtasn1-6 libtbb2 libtiff5 libtinfo6 libtirpc3 libunistring2 liburiparser1 libuuid1 libwebp6 libx265-192 libxerces-c3.2 libxml2 libzmq3-dev libzmq5 libzstd1 odbcinst1debian2 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-10-linux-${OS_ARCH}-debian-11" \ "mxnet-1.9.1-162-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 \ @@ -46,7 +45,7 @@ RUN /opt/bitnami/scripts/mxnet/postunpack.sh ENV APP_VERSION="1.9.1" \ BITNAMI_APP_NAME="mxnet" \ LD_LIBRARY_PATH="/opt/bitnami/python/lib:$LD_LIBRARY_PATH" \ - PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:$PATH" + PATH="/opt/bitnami/python/bin:$PATH" WORKDIR /app USER 1001 diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 88e7877c2ea2..b931bd8307a0 100644 --- a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mxnet/1/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" - }, "mxnet": { "arch": "amd64", "distro": "debian-11", @@ -15,6 +9,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.8.16-9" + "version": "3.8.16-10" } } \ No newline at end of file diff --git a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/mxnet/1/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/mxnet/1/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