From 40aa7ad0ad4d3aaf8d741a8b3a2d6c09c4513984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20G=C3=B3mez=20Gracia?= Date: Mon, 14 Apr 2025 19:21:52 +0200 Subject: [PATCH] [bitnami/jupyterhub] Remove 4.x folders after 5.x release (#80126) Signed-off-by: Gonzalo Gomez Gracia --- .../4/debian-12/Dockerfile | 56 ------------------- .../opt/bitnami/.bitnami_components.json | 14 ----- .../opt/bitnami/licenses/licenses.txt | 2 - .../prebuildfs/usr/sbin/install_packages | 27 --------- .../debian-12/prebuildfs/usr/sbin/run-script | 24 -------- .../4/debian-12/tags-info.yaml | 4 -- bitnami/jupyter-base-notebook/5/README.md | 5 -- bitnami/jupyterhub/4/debian-12/Dockerfile | 54 ------------------ .../opt/bitnami/.bitnami_components.json | 14 ----- .../opt/bitnami/licenses/licenses.txt | 2 - .../prebuildfs/usr/sbin/install_packages | 27 --------- .../debian-12/prebuildfs/usr/sbin/run-script | 24 -------- bitnami/jupyterhub/4/debian-12/tags-info.yaml | 5 -- bitnami/jupyterhub/5/README.md | 5 -- 14 files changed, 263 deletions(-) delete mode 100644 bitnami/jupyter-base-notebook/4/debian-12/Dockerfile delete mode 100644 bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/usr/sbin/install_packages delete mode 100755 bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/usr/sbin/run-script delete mode 100644 bitnami/jupyter-base-notebook/4/debian-12/tags-info.yaml delete mode 100644 bitnami/jupyter-base-notebook/5/README.md delete mode 100644 bitnami/jupyterhub/4/debian-12/Dockerfile delete mode 100644 bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/jupyterhub/4/debian-12/prebuildfs/usr/sbin/install_packages delete mode 100755 bitnami/jupyterhub/4/debian-12/prebuildfs/usr/sbin/run-script delete mode 100644 bitnami/jupyterhub/4/debian-12/tags-info.yaml delete mode 100644 bitnami/jupyterhub/5/README.md diff --git a/bitnami/jupyter-base-notebook/4/debian-12/Dockerfile b/bitnami/jupyter-base-notebook/4/debian-12/Dockerfile deleted file mode 100644 index 3d79b72a76a2..000000000000 --- a/bitnami/jupyter-base-notebook/4/debian-12/Dockerfile +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 - -FROM docker.io/bitnami/minideb:bookworm - -ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" -ARG TARGETARCH - -LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ - org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-04-07T13:28:46Z" \ - 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.ref.name="4.1.6-debian-12-r29" \ - 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="4.1.6" - -ENV HOME="/opt/bitnami/jupyterhub-singleuser/" \ - OS_ARCH="${TARGETARCH:-amd64}" \ - OS_FLAVOUR="debian-12" \ - OS_NAME="linux" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages ca-certificates curl libgcc-s1 libstdc++6 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ - COMPONENTS=( \ - "miniforge-24.11.3-1-linux-${OS_ARCH}-debian-12" \ - "jupyter-base-notebook-4.1.6-22-linux-${OS_ARCH}-debian-12" \ - ) ; \ - for COMPONENT in "${COMPONENTS[@]}"; do \ - if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \ - fi ; \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ - rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ - done -RUN apt-get autoremove --purge -y curl && \ - 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 -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="4.1.6" \ - BITNAMI_APP_NAME="jupyter-base-notebook" \ - PATH="/opt/bitnami/miniforge/bin:/opt/bitnami/common/bin:$PATH" - -USER 1001 -ENTRYPOINT [ "tini", "-g", "--" ] -CMD [ "jupyterhub-singleuser" ] diff --git a/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index b49464eba9c0..000000000000 --- a/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "jupyter-base-notebook": { - "arch": "amd64", - "distro": "debian-12", - "type": "NAMI", - "version": "4.1.6-22" - }, - "miniforge": { - "arch": "amd64", - "distro": "debian-12", - "type": "NAMI", - "version": "24.11.3-1" - } -} \ No newline at end of file diff --git a/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index 76956b38e82c..000000000000 --- a/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt +++ /dev/null @@ -1,2 +0,0 @@ -Bitnami containers ship with software bundles. You can find the licenses under: -/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/usr/sbin/install_packages b/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index ccce248b2d14..000000000000 --- a/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/usr/sbin/install_packages +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 -set -eu - -n=0 -max=2 -export DEBIAN_FRONTEND=noninteractive - -until [ $n -gt $max ]; do - set +e - ( - apt-get update -qq && - apt-get install -y --no-install-recommends "$@" - ) - CODE=$? - set -e - if [ $CODE -eq 0 ]; then - break - fi - if [ $n -eq $max ]; then - exit $CODE - fi - echo "apt failed, retrying" - n=$(($n + 1)) -done -apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/usr/sbin/run-script b/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 0e07c9038dfd..000000000000 --- a/bitnami/jupyter-base-notebook/4/debian-12/prebuildfs/usr/sbin/run-script +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 -set -u - -if [ $# -eq 0 ]; then - >&2 echo "No arguments provided" - exit 1 -fi - -script=$1 -exit_code="${2:-96}" -fail_if_not_present="${3:-n}" - -if test -f "$script"; then - sh $script - - if [ $? -ne 0 ]; then - exit $((exit_code)) - fi -elif [ "$fail_if_not_present" = "y" ]; then - >&2 echo "script not found: $script" - exit 127 -fi diff --git a/bitnami/jupyter-base-notebook/4/debian-12/tags-info.yaml b/bitnami/jupyter-base-notebook/4/debian-12/tags-info.yaml deleted file mode 100644 index e3a6a20b79ee..000000000000 --- a/bitnami/jupyter-base-notebook/4/debian-12/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 5237e148ec0d..000000000000 --- a/bitnami/jupyter-base-notebook/5/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# 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 Electronics](https://www.arrow.com/globalecs/na/vendors/bitnami?utm_source=GitHub&utm_medium=containers) for more information. diff --git a/bitnami/jupyterhub/4/debian-12/Dockerfile b/bitnami/jupyterhub/4/debian-12/Dockerfile deleted file mode 100644 index 8b30d5d3fc99..000000000000 --- a/bitnami/jupyterhub/4/debian-12/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 - -FROM docker.io/bitnami/minideb:bookworm - -ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" -ARG TARGETARCH - -LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ - org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-04-07T13:28:59Z" \ - 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.ref.name="4.1.6-debian-12-r17" \ - 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="4.1.6" - -ENV HOME="/" \ - OS_ARCH="${TARGETARCH:-amd64}" \ - OS_FLAVOUR="debian-12" \ - OS_NAME="linux" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages ca-certificates curl libgcc-s1 libstdc++6 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ - COMPONENTS=( \ - "miniforge-24.11.3-1-linux-${OS_ARCH}-debian-12" \ - "jupyterhub-4.1.6-6-linux-${OS_ARCH}-debian-12" \ - ) ; \ - for COMPONENT in "${COMPONENTS[@]}"; do \ - if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \ - fi ; \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ - rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ - done -RUN apt-get autoremove --purge -y curl && \ - 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 -RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true - -ENV APP_VERSION="4.1.6" \ - BITNAMI_APP_NAME="jupyterhub" \ - PATH="/opt/bitnami/miniforge/bin:/opt/bitnami/miniforge/bin/:$PATH" - -USER 1001 -ENTRYPOINT [ "jupyterhub" ] diff --git a/bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index a8b409a2c38e..000000000000 --- a/bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "jupyterhub": { - "arch": "amd64", - "distro": "debian-12", - "type": "NAMI", - "version": "4.1.6-6" - }, - "miniforge": { - "arch": "amd64", - "distro": "debian-12", - "type": "NAMI", - "version": "24.11.3-1" - } -} \ No newline at end of file diff --git a/bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index 76956b38e82c..000000000000 --- a/bitnami/jupyterhub/4/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt +++ /dev/null @@ -1,2 +0,0 @@ -Bitnami containers ship with software bundles. You can find the licenses under: -/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/jupyterhub/4/debian-12/prebuildfs/usr/sbin/install_packages b/bitnami/jupyterhub/4/debian-12/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index ccce248b2d14..000000000000 --- a/bitnami/jupyterhub/4/debian-12/prebuildfs/usr/sbin/install_packages +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 -set -eu - -n=0 -max=2 -export DEBIAN_FRONTEND=noninteractive - -until [ $n -gt $max ]; do - set +e - ( - apt-get update -qq && - apt-get install -y --no-install-recommends "$@" - ) - CODE=$? - set -e - if [ $CODE -eq 0 ]; then - break - fi - if [ $n -eq $max ]; then - exit $CODE - fi - echo "apt failed, retrying" - n=$(($n + 1)) -done -apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/jupyterhub/4/debian-12/prebuildfs/usr/sbin/run-script b/bitnami/jupyterhub/4/debian-12/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 0e07c9038dfd..000000000000 --- a/bitnami/jupyterhub/4/debian-12/prebuildfs/usr/sbin/run-script +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 -set -u - -if [ $# -eq 0 ]; then - >&2 echo "No arguments provided" - exit 1 -fi - -script=$1 -exit_code="${2:-96}" -fail_if_not_present="${3:-n}" - -if test -f "$script"; then - sh $script - - if [ $? -ne 0 ]; then - exit $((exit_code)) - fi -elif [ "$fail_if_not_present" = "y" ]; then - >&2 echo "script not found: $script" - exit 127 -fi diff --git a/bitnami/jupyterhub/4/debian-12/tags-info.yaml b/bitnami/jupyterhub/4/debian-12/tags-info.yaml deleted file mode 100644 index b16c66cb2f00..000000000000 --- a/bitnami/jupyterhub/4/debian-12/tags-info.yaml +++ /dev/null @@ -1,5 +0,0 @@ -rolling-tags: -- "4" -- 4-debian-12 -- 4.1.6 -- latest diff --git a/bitnami/jupyterhub/5/README.md b/bitnami/jupyterhub/5/README.md deleted file mode 100644 index 5237e148ec0d..000000000000 --- a/bitnami/jupyterhub/5/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# 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 Electronics](https://www.arrow.com/globalecs/na/vendors/bitnami?utm_source=GitHub&utm_medium=containers) for more information.