From f6bee50d3cda4e17c8ecf2cab2685fc0329a3ef0 Mon Sep 17 00:00:00 2001 From: David Gomez Date: Tue, 10 Dec 2024 13:37:52 +0100 Subject: [PATCH] [bitnami/jupyter*] Use version 4 as LTS (#75672) Signed-off-by: David Gomez --- .../{5 => 4}/debian-12/Dockerfile | 10 +++++----- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../prebuildfs/opt/bitnami/licenses/licenses.txt | 0 .../debian-12/prebuildfs/usr/sbin/install_packages | 0 .../{5 => 4}/debian-12/prebuildfs/usr/sbin/run-script | 0 .../jupyter-base-notebook/4/debian-12/tags-info.yaml | 4 ++++ bitnami/jupyter-base-notebook/5/README.md | 5 +++++ .../jupyter-base-notebook/5/debian-12/tags-info.yaml | 5 ----- bitnami/jupyterhub/{5 => 4}/debian-12/Dockerfile | 10 +++++----- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../prebuildfs/opt/bitnami/licenses/licenses.txt | 0 .../debian-12/prebuildfs/usr/sbin/install_packages | 0 .../{5 => 4}/debian-12/prebuildfs/usr/sbin/run-script | 0 bitnami/jupyterhub/4/debian-12/tags-info.yaml | 5 +++++ bitnami/jupyterhub/5/README.md | 5 +++++ bitnami/jupyterhub/5/debian-12/tags-info.yaml | 4 ---- 16 files changed, 31 insertions(+), 21 deletions(-) rename bitnami/jupyter-base-notebook/{5 => 4}/debian-12/Dockerfile (90%) rename bitnami/jupyter-base-notebook/{5 => 4}/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json (89%) rename bitnami/jupyter-base-notebook/{5 => 4}/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt (100%) rename bitnami/jupyter-base-notebook/{5 => 4}/debian-12/prebuildfs/usr/sbin/install_packages (100%) rename bitnami/jupyter-base-notebook/{5 => 4}/debian-12/prebuildfs/usr/sbin/run-script (100%) create mode 100644 bitnami/jupyter-base-notebook/4/debian-12/tags-info.yaml create mode 100644 bitnami/jupyter-base-notebook/5/README.md delete mode 100644 bitnami/jupyter-base-notebook/5/debian-12/tags-info.yaml rename bitnami/jupyterhub/{5 => 4}/debian-12/Dockerfile (89%) rename bitnami/jupyterhub/{5 => 4}/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json (89%) rename bitnami/jupyterhub/{5 => 4}/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt (100%) rename bitnami/jupyterhub/{5 => 4}/debian-12/prebuildfs/usr/sbin/install_packages (100%) rename bitnami/jupyterhub/{5 => 4}/debian-12/prebuildfs/usr/sbin/run-script (100%) create mode 100644 bitnami/jupyterhub/4/debian-12/tags-info.yaml create mode 100644 bitnami/jupyterhub/5/README.md delete mode 100644 bitnami/jupyterhub/5/debian-12/tags-info.yaml diff --git a/bitnami/jupyter-base-notebook/5/debian-12/Dockerfile b/bitnami/jupyter-base-notebook/4/debian-12/Dockerfile similarity index 90% rename from bitnami/jupyter-base-notebook/5/debian-12/Dockerfile rename to bitnami/jupyter-base-notebook/4/debian-12/Dockerfile index 31af0abfc866..b44da968cc2c 100644 --- a/bitnami/jupyter-base-notebook/5/debian-12/Dockerfile +++ b/bitnami/jupyter-base-notebook/4/debian-12/Dockerfile @@ -8,15 +8,15 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-12-03T23:55:10Z" \ + org.opencontainers.image.created="2024-12-03T23:50:45Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/jupyter-base-notebook/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.2.1-debian-12-r10" \ + org.opencontainers.image.ref.name="4.1.6-debian-12-r15" \ 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="Broadcom, Inc." \ - org.opencontainers.image.version="5.2.1" + org.opencontainers.image.version="4.1.6" ENV HOME="/opt/bitnami/jupyterhub-singleuser/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -30,7 +30,7 @@ RUN install_packages ca-certificates curl libgcc-s1 libstdc++6 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "miniforge-24.9.2-0-linux-${OS_ARCH}-debian-12" \ - "jupyter-base-notebook-5.2.1-9-linux-${OS_ARCH}-debian-12" \ + "jupyter-base-notebook-4.1.6-14-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -48,7 +48,7 @@ RUN chmod g+rwX /opt/bitnami RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true RUN mkdir /opt/bitnami/jupyterhub-singleuser/ && chmod g+rwX /opt/bitnami/jupyterhub-singleuser/ -ENV APP_VERSION="5.2.1" \ +ENV APP_VERSION="4.1.6" \ BITNAMI_APP_NAME="jupyter-base-notebook" \ PATH="/opt/bitnami/miniforge/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/jupyter-base-notebook/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json similarity index 89% rename from bitnami/jupyter-base-notebook/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json rename to bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 8b354bb00056..c76d279e881a 100644 --- a/bitnami/jupyter-base-notebook/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "5.2.1-9" + "version": "4.1.6-14" }, "miniforge": { "arch": "amd64", diff --git a/bitnami/jupyter-base-notebook/5/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/jupyter-base-notebook/5/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt rename to bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/jupyter-base-notebook/5/debian-12/prebuildfs/usr/sbin/install_packages b/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/usr/sbin/install_packages similarity index 100% rename from bitnami/jupyter-base-notebook/5/debian-12/prebuildfs/usr/sbin/install_packages rename to bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/jupyter-base-notebook/5/debian-12/prebuildfs/usr/sbin/run-script b/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/usr/sbin/run-script similarity index 100% rename from bitnami/jupyter-base-notebook/5/debian-12/prebuildfs/usr/sbin/run-script rename to bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/usr/sbin/run-script diff --git a/bitnami/jupyter-base-notebook/4/debian-12/tags-info.yaml b/bitnami/jupyter-base-notebook/4/debian-12/tags-info.yaml new file mode 100644 index 000000000000..e3a6a20b79ee --- /dev/null +++ b/bitnami/jupyter-base-notebook/4/debian-12/tags-info.yaml @@ -0,0 +1,4 @@ +rolling-tags: +- "4" +- 4-debian-12 +- 4.1.6 diff --git a/bitnami/jupyter-base-notebook/5/README.md b/bitnami/jupyter-base-notebook/5/README.md new file mode 100644 index 000000000000..bf1115d75450 --- /dev/null +++ b/bitnami/jupyter-base-notebook/5/README.md @@ -0,0 +1,5 @@ +# Only latest stable branch maintained in the free Bitnami catalog + +Starting December 10th 2024, only the latest stable branch of any container will receive updates in the free Bitnami catalog. To access up-to-date releases for all upstream-supported branches, consider upgrading to Bitnami Premium. Previous versions already released will not be deleted. They are still available to pull from DockerHub. + +Please check the Bitnami Premium page in our partner Arrow's marketplace. See [https://www.arrow.com/globalecs/na/vendors/bitnami](https://www.arrow.com/globalecs/na/vendors/bitnami?utm_source=GitHub&utm_medium=containers) for more information. diff --git a/bitnami/jupyter-base-notebook/5/debian-12/tags-info.yaml b/bitnami/jupyter-base-notebook/5/debian-12/tags-info.yaml deleted file mode 100644 index e9ff9ebd07b7..000000000000 --- a/bitnami/jupyter-base-notebook/5/debian-12/tags-info.yaml +++ /dev/null @@ -1,5 +0,0 @@ -rolling-tags: -- "5" -- 5-debian-12 -- 5.2.1 -- latest diff --git a/bitnami/jupyterhub/5/debian-12/Dockerfile b/bitnami/jupyterhub/4/debian-12/Dockerfile similarity index 89% rename from bitnami/jupyterhub/5/debian-12/Dockerfile rename to bitnami/jupyterhub/4/debian-12/Dockerfile index dd9d2e52b93c..4a2d8264b4eb 100644 --- a/bitnami/jupyterhub/5/debian-12/Dockerfile +++ b/bitnami/jupyterhub/4/debian-12/Dockerfile @@ -8,15 +8,15 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-11-25T13:11:31Z" \ + org.opencontainers.image.created="2024-11-25T13:28:26Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/jupyterhub/README.md" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.2.1-debian-12-r3" \ + org.opencontainers.image.ref.name="4.1.6-debian-12-r7" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/jupyterhub" \ org.opencontainers.image.title="jupyterhub" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="5.2.1" + org.opencontainers.image.version="4.1.6" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -30,7 +30,7 @@ RUN install_packages ca-certificates curl libgcc-s1 libstdc++6 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ "miniforge-24.9.2-0-linux-${OS_ARCH}-debian-12" \ - "jupyterhub-5.2.1-2-linux-${OS_ARCH}-debian-12" \ + "jupyterhub-4.1.6-4-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -47,7 +47,7 @@ RUN apt-get autoremove --purge -y curl && \ RUN chmod g+rwX /opt/bitnami RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true -ENV APP_VERSION="5.2.1" \ +ENV APP_VERSION="4.1.6" \ BITNAMI_APP_NAME="jupyterhub" \ PATH="/opt/bitnami/miniforge/bin:/opt/bitnami/miniforge/bin/:$PATH" diff --git a/bitnami/jupyterhub/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json similarity index 89% rename from bitnami/jupyterhub/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json rename to bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index 55baa7d56ffe..d906f8d3b710 100644 --- a/bitnami/jupyterhub/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "5.2.1-2" + "version": "4.1.6-4" }, "miniforge": { "arch": "amd64", diff --git a/bitnami/jupyterhub/5/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt similarity index 100% rename from bitnami/jupyterhub/5/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt rename to bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/jupyterhub/5/debian-12/prebuildfs/usr/sbin/install_packages b/bitnami/jupyterhub/4/debian-12/prebuildfs/usr/sbin/install_packages similarity index 100% rename from bitnami/jupyterhub/5/debian-12/prebuildfs/usr/sbin/install_packages rename to bitnami/jupyterhub/4/debian-12/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/jupyterhub/5/debian-12/prebuildfs/usr/sbin/run-script b/bitnami/jupyterhub/4/debian-12/prebuildfs/usr/sbin/run-script similarity index 100% rename from bitnami/jupyterhub/5/debian-12/prebuildfs/usr/sbin/run-script rename to bitnami/jupyterhub/4/debian-12/prebuildfs/usr/sbin/run-script diff --git a/bitnami/jupyterhub/4/debian-12/tags-info.yaml b/bitnami/jupyterhub/4/debian-12/tags-info.yaml new file mode 100644 index 000000000000..b16c66cb2f00 --- /dev/null +++ b/bitnami/jupyterhub/4/debian-12/tags-info.yaml @@ -0,0 +1,5 @@ +rolling-tags: +- "4" +- 4-debian-12 +- 4.1.6 +- latest diff --git a/bitnami/jupyterhub/5/README.md b/bitnami/jupyterhub/5/README.md new file mode 100644 index 000000000000..bf1115d75450 --- /dev/null +++ b/bitnami/jupyterhub/5/README.md @@ -0,0 +1,5 @@ +# Only latest stable branch maintained in the free Bitnami catalog + +Starting December 10th 2024, only the latest stable branch of any container will receive updates in the free Bitnami catalog. To access up-to-date releases for all upstream-supported branches, consider upgrading to Bitnami Premium. Previous versions already released will not be deleted. They are still available to pull from DockerHub. + +Please check the Bitnami Premium page in our partner Arrow's marketplace. See [https://www.arrow.com/globalecs/na/vendors/bitnami](https://www.arrow.com/globalecs/na/vendors/bitnami?utm_source=GitHub&utm_medium=containers) for more information. diff --git a/bitnami/jupyterhub/5/debian-12/tags-info.yaml b/bitnami/jupyterhub/5/debian-12/tags-info.yaml deleted file mode 100644 index 02a0127f6251..000000000000 --- a/bitnami/jupyterhub/5/debian-12/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rolling-tags: -- "5" -- 5-debian-12 -- 5.2.1