diff --git a/bitnami/jupyter-base-notebook/2/debian-11/Dockerfile b/bitnami/jupyter-base-notebook/2/debian-11/Dockerfile index d637b718b9c8..dca56334b7df 100644 --- a/bitnami/jupyter-base-notebook/2/debian-11/Dockerfile +++ b/bitnami/jupyter-base-notebook/2/debian-11/Dockerfile @@ -4,7 +4,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="2.3.1-debian-11-r40" \ + org.opencontainers.image.ref.name="2.3.1-debian-11-r41" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/jupyter-base-notebook" \ org.opencontainers.image.title="jupyter-base-notebook" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -19,6 +19,14 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl gzip libc6 libcrypt1 libgcc-s1 libstdc++6 procps tar +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f tini-0.19.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/tini-0.19.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/tini-0.19.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ + fi && \ + sha256sum -c tini-0.19.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf tini-0.19.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf tini-0.19.0-154-linux-${OS_ARCH}-debian-11.tar.gz tini-0.19.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ if [ ! -f miniconda-4.12.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ curl -SsLf https://downloads.bitnami.com/files/stacksmith/miniconda-4.12.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ @@ -28,13 +36,13 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ tar -zxf miniconda-4.12.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ rm -rf miniconda-4.12.0-154-linux-${OS_ARCH}-debian-11.tar.gz miniconda-4.12.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f jupyter-base-notebook-2.3.1-153-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/jupyter-base-notebook-2.3.1-153-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/jupyter-base-notebook-2.3.1-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ + if [ ! -f jupyter-base-notebook-2.3.1-155-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/jupyter-base-notebook-2.3.1-155-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/jupyter-base-notebook-2.3.1-155-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - sha256sum -c jupyter-base-notebook-2.3.1-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf jupyter-base-notebook-2.3.1-153-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf jupyter-base-notebook-2.3.1-153-linux-${OS_ARCH}-debian-11.tar.gz jupyter-base-notebook-2.3.1-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 + sha256sum -c jupyter-base-notebook-2.3.1-155-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf jupyter-base-notebook-2.3.1-155-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf jupyter-base-notebook-2.3.1-155-linux-${OS_ARCH}-debian-11.tar.gz jupyter-base-notebook-2.3.1-155-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami @@ -42,7 +50,7 @@ RUN mkdir /opt/bitnami/jupyterhub-singleuser/ && chmod g+rwX /opt/bitnami/jupyte ENV APP_VERSION="2.3.1" \ BITNAMI_APP_NAME="jupyter-base-notebook" \ - PATH="/opt/bitnami/miniconda/bin:$PATH" + PATH="/opt/bitnami/common/bin:/opt/bitnami/miniconda/bin:$PATH" USER 1001 ENTRYPOINT [ "tini", "-g", "--" ] diff --git a/bitnami/jupyter-base-notebook/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jupyter-base-notebook/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 83f5db671ab1..e45e8f458f06 100644 --- a/bitnami/jupyter-base-notebook/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jupyter-base-notebook/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,10 +1,10 @@ { "jupyter-base-notebook": { "arch": "amd64", - "digest": "40000fbbb169f061f5491fae52ee9945702a52b393adc25657650e135471d675", + "digest": "3f9504c84b162c5740f4c0f0c7888412dbc1c7cb0a2b6b20be36fbf3880df6a7", "distro": "debian-11", "type": "NAMI", - "version": "2.3.1-153" + "version": "2.3.1-155" }, "miniconda": { "arch": "amd64", @@ -12,5 +12,12 @@ "distro": "debian-11", "type": "NAMI", "version": "4.12.0-154" + }, + "tini": { + "arch": "amd64", + "digest": "50b38ec9a9be93542fe7d46c68f8a5d6f127acff24c3a7153edbb2849a474433", + "distro": "debian-11", + "type": "NAMI", + "version": "0.19.0-154" } } \ No newline at end of file diff --git a/bitnami/jupyter-base-notebook/2/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/jupyter-base-notebook/2/debian-11/prebuildfs/usr/sbin/install_packages index 2c915f265c9d..77857a1a57f2 100755 --- a/bitnami/jupyter-base-notebook/2/debian-11/prebuildfs/usr/sbin/install_packages +++ b/bitnami/jupyter-base-notebook/2/debian-11/prebuildfs/usr/sbin/install_packages @@ -1,9 +1,10 @@ #!/bin/sh -set -e -set -u -export DEBIAN_FRONTEND=noninteractive +set -eu + n=0 max=2 +export DEBIAN_FRONTEND=noninteractive + until [ $n -gt $max ]; do set +e ( diff --git a/bitnami/jupyter-base-notebook/README.md b/bitnami/jupyter-base-notebook/README.md index fb9b93b95885..cd62c0d3809d 100644 --- a/bitnami/jupyter-base-notebook/README.md +++ b/bitnami/jupyter-base-notebook/README.md @@ -28,7 +28,7 @@ $ docker run --name jupyter-base-notebook bitnami/jupyter-base-notebook:latest 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/). -* [`2`, `2-debian-11`, `2.3.1`, `2.3.1-debian-11-r40`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/jupyter-base-notebook/2/debian-11/Dockerfile) +* [`2`, `2-debian-11`, `2.3.1`, `2.3.1-debian-11-r41`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/jupyter-base-notebook/2/debian-11/Dockerfile) * [`1`, `1-debian-11`, `1.5.0`, `1.5.0-debian-11-r40` (1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/jupyter-base-notebook/1/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).