From dcaa1b5263aea00876ea2e94f0db696721e28e8b Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 17 May 2023 07:23:28 +0100 Subject: [PATCH] [bitnami/tensorflow-resnet] Release 2.12.1-debian-11-r0 (#34251) Signed-off-by: Bitnami Containers --- .../tensorflow-resnet/2/debian-11/Dockerfile | 13 +-- .../opt/bitnami/.bitnami_components.json | 8 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 104 +++++++++++++++++- .../2/debian-11/tags-info.yaml | 2 +- bitnami/tensorflow-resnet/README.md | 2 + 5 files changed, 112 insertions(+), 17 deletions(-) diff --git a/bitnami/tensorflow-resnet/2/debian-11/Dockerfile b/bitnami/tensorflow-resnet/2/debian-11/Dockerfile index 776153f8f117..9e9b968d8a48 100644 --- a/bitnami/tensorflow-resnet/2/debian-11/Dockerfile +++ b/bitnami/tensorflow-resnet/2/debian-11/Dockerfile @@ -3,13 +3,13 @@ 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-17T00:16:45Z" \ + org.opencontainers.image.created="2023-05-17T06:03:40Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.11.1-debian-11-r7" \ + org.opencontainers.image.ref.name="2.12.1-debian-11-r0" \ org.opencontainers.image.title="tensorflow-resnet" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.11.1" + org.opencontainers.image.version="2.12.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,8 +22,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl gcc-10 libgcc-s1 libstdc++6 procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "tensorflow-resnet-2.11.1-1-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ + "tensorflow-resnet-2.12.1-1-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -40,9 +39,9 @@ RUN chmod g+rwX /opt/bitnami RUN mkdir /.local && chmod g+rwX /.local COPY rootfs / -ENV APP_VERSION="2.11.1" \ +ENV APP_VERSION="2.12.1" \ BITNAMI_APP_NAME="tensorflow-resnet" \ - PATH="/opt/bitnami/tensorflow-resnet/bin:/opt/bitnami/common/bin:$PATH" + PATH="/opt/bitnami/tensorflow-resnet/bin:$PATH" USER 1001 ENTRYPOINT [ "/opt/bitnami/scripts/tensorflow-resnet/entrypoint.sh" ] diff --git a/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7f484635f799..ac4822d174cd 100644 --- a/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/tensorflow-resnet/2/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" - }, "tensorflow-resnet": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.11.1-1" + "version": "2.12.1-1" } } \ No newline at end of file diff --git a/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..6d9ca8546eef 100644 --- a/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/tensorflow-resnet/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -412,11 +412,16 @@ generate_random_string() { ascii) filter="[:print:]" ;; + numeric) + filter="0-9" + ;; alphanumeric) filter="a-zA-Z0-9" ;; - numeric) - filter="0-9" + alphanumeric+special|special+alphanumeric) + # Limit variety of special characters, so there is a higher chance of containing more alphanumeric characters + # Special characters are harder to write, and it could impact the overall UX if most passwords are too complex + filter='a-zA-Z0-9:@.,/+!=' ;; *) echo "Invalid type ${type}" >&2 @@ -553,3 +558,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 +} diff --git a/bitnami/tensorflow-resnet/2/debian-11/tags-info.yaml b/bitnami/tensorflow-resnet/2/debian-11/tags-info.yaml index ad8b31a588da..5ac2ee2bfa66 100644 --- a/bitnami/tensorflow-resnet/2/debian-11/tags-info.yaml +++ b/bitnami/tensorflow-resnet/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.11.1 +- 2.12.1 - latest diff --git a/bitnami/tensorflow-resnet/README.md b/bitnami/tensorflow-resnet/README.md index d413c867715a..d0ae1b87747e 100644 --- a/bitnami/tensorflow-resnet/README.md +++ b/bitnami/tensorflow-resnet/README.md @@ -34,6 +34,8 @@ docker-compose up -d * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. +Looking to use TensorFlow ResNet in production? Try [VMware Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. + ## Why use a non-root container? Non-root container images add an extra layer of security and are generally recommended for production environments. However, because they run as a non-root user, privileged tasks are typically off-limits. Learn more about non-root containers [in our docs](https://docs.bitnami.com/tutorials/work-with-non-root-containers/).