diff --git a/bitnami/pytorch/1/debian-11/Dockerfile b/bitnami/pytorch/1/debian-11/Dockerfile index b2c4481febc4..aacc912886dd 100644 --- a/bitnami/pytorch/1/debian-11/Dockerfile +++ b/bitnami/pytorch/1/debian-11/Dockerfile @@ -6,7 +6,7 @@ ENV HOME="/" \ LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="1.12.1-debian-11-r4" \ + org.opencontainers.image.ref.name="1.12.1-debian-11-r5" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/pytorch" \ org.opencontainers.image.title="pytorch" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -15,9 +15,9 @@ LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages acl ca-certificates curl gzip libbz2-1.0 libc6 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 libtcmalloc-minimal4 libtinfo6 libtirpc3 numactl procps tar zlib1g +RUN install_packages acl ca-certificates curl gzip libbz2-1.0 libc6 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 tar zlib1g RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "python" "3.8.13-165" --checksum 2bf41f60dccdcf65842d993083c2dcb27ab48a8a514fdeb1778e9b09f3e4a203 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "pytorch" "1.12.1-0" --checksum 215597f705e517eec659d4ee8f4c65c8d5a2cc377fac13aab888a68f8f095aa4 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "pytorch" "1.12.1-1" --checksum 219c27a495aed05b5c3c05a183da393fd2e352b6b8ef28738b1db84c6816c685 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-153" --checksum d3ae0109be24e8bc56f97359b8290b91243454de946dd60bd8520a0896a88449 RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives @@ -27,8 +27,6 @@ COPY rootfs / RUN /opt/bitnami/scripts/pytorch/postunpack.sh ENV APP_VERSION="1.12.1" \ BITNAMI_APP_NAME="pytorch" \ - LD_LIBRARY_PATH="/opt/bitnami/python/lib/python3.7/site-packages/torch/lib/:/opt/bitnami/python/lib/python3.7/site-packages/PIL/.libs/:$LD_LIBRARY_PATH" \ - LD_PRELOAD="/opt/bitnami/python/lib/libiomp5.so:/usr/lib/x86_64-linux-gnu/libjemalloc.so.2" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:$PATH" WORKDIR /app diff --git a/bitnami/pytorch/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pytorch/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 92ae8916de9b..5753147df8ee 100644 --- a/bitnami/pytorch/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/pytorch/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,9 +15,9 @@ }, "pytorch": { "arch": "amd64", - "digest": "215597f705e517eec659d4ee8f4c65c8d5a2cc377fac13aab888a68f8f095aa4", + "digest": "219c27a495aed05b5c3c05a183da393fd2e352b6b8ef28738b1db84c6816c685", "distro": "debian-11", "type": "NAMI", - "version": "1.12.1-0" + "version": "1.12.1-1" } } \ No newline at end of file diff --git a/bitnami/pytorch/1/debian-11/rootfs/opt/bitnami/scripts/pytorch/entrypoint.sh b/bitnami/pytorch/1/debian-11/rootfs/opt/bitnami/scripts/pytorch/entrypoint.sh index d6f3911410dd..b3377018ebad 100755 --- a/bitnami/pytorch/1/debian-11/rootfs/opt/bitnami/scripts/pytorch/entrypoint.sh +++ b/bitnami/pytorch/1/debian-11/rootfs/opt/bitnami/scripts/pytorch/entrypoint.sh @@ -10,6 +10,31 @@ set -o pipefail # Load libraries . /opt/bitnami/scripts/libbitnami.sh +######################## +# Find the path to the libjemalloc library file +# Globals: +# None +# Arguments: +# None +# Returns: +# Path to a libjemalloc shared object file +######################### +find_jemalloc_lib() { + local -a locations=( "/usr/lib" "/usr/lib64" ) + local -r pattern='libjemalloc.so.[0-9]' + local path + for dir in "${locations[@]}"; do + # Find the first element matching the pattern and quit + [[ ! -d "$dir" ]] && continue + path="$(find "$dir" -name "$pattern" -print -quit)" + [[ -n "$path" ]] && break + done + echo "${path:-}" +} + +LD_PRELOAD="$(find_jemalloc_lib)${LD_PRELOAD:+ "$LD_PRELOAD"}" +export LD_PRELOAD + print_welcome_page echo "" diff --git a/bitnami/pytorch/README.md b/bitnami/pytorch/README.md index 1cbebbc75b29..db890ca14a76 100644 --- a/bitnami/pytorch/README.md +++ b/bitnami/pytorch/README.md @@ -39,7 +39,7 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`1`, `1-debian-11`, `1.12.1`, `1.12.1-debian-11-r4`, `latest` (1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/pytorch/1/debian-11/Dockerfile) +* [`1`, `1-debian-11`, `1.12.1`, `1.12.1-debian-11-r5`, `latest` (1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/pytorch/1/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).