From c3d57f569d3b9fdbca96dfa790e5c6a7fde6ae7e Mon Sep 17 00:00:00 2001 From: Cori Avila <42420333+corico44@users.noreply.github.com> Date: Thu, 1 Jun 2023 15:36:26 +0200 Subject: [PATCH] [bitnami/jupyterhub] Deprecate jupyterhub branch 3 (#36044) Signed-off-by: Cori Avila --- bitnami/jupyterhub/3/debian-11/Dockerfile | 47 ------------------- .../jupyterhub/3/debian-11/docker-compose.yml | 7 --- .../opt/bitnami/.bitnami_components.json | 14 ------ .../opt/bitnami/licenses/licenses.txt | 3 -- .../prebuildfs/usr/sbin/install_packages | 25 ---------- bitnami/jupyterhub/3/debian-11/tags-info.yaml | 4 -- 6 files changed, 100 deletions(-) delete mode 100644 bitnami/jupyterhub/3/debian-11/Dockerfile delete mode 100644 bitnami/jupyterhub/3/debian-11/docker-compose.yml delete mode 100644 bitnami/jupyterhub/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/jupyterhub/3/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/jupyterhub/3/debian-11/prebuildfs/usr/sbin/install_packages delete mode 100644 bitnami/jupyterhub/3/debian-11/tags-info.yaml diff --git a/bitnami/jupyterhub/3/debian-11/Dockerfile b/bitnami/jupyterhub/3/debian-11/Dockerfile deleted file mode 100644 index 24a54dbef2f4..000000000000 --- a/bitnami/jupyterhub/3/debian-11/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM docker.io/bitnami/minideb:bullseye - -ARG TARGETARCH - -LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-05-30T14:15:51Z" \ - org.opencontainers.image.description="Application packaged by VMware, Inc" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.1.1-debian-11-r40" \ - org.opencontainers.image.title="jupyterhub" \ - org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="3.1.1" - -ENV HOME="/" \ - OS_ARCH="${TARGETARCH:-amd64}" \ - OS_FLAVOUR="debian-11" \ - OS_NAME="linux" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcrypt1 libcurl4 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libstdc++6 libtasn1-6 libunistring2 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - COMPONENTS=( \ - "miniconda-4.12.0-164-linux-${OS_ARCH}-debian-11" \ - "jupyterhub-3.1.1-6-linux-${OS_ARCH}-debian-11" \ - ) && \ - for COMPONENT in "${COMPONENTS[@]}"; do \ - if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${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 --wildcards '*/files' && \ - 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 - -ENV APP_VERSION="3.1.1" \ - BITNAMI_APP_NAME="jupyterhub" \ - PATH="/opt/bitnami/miniconda/bin:/opt/bitnami/miniconda/bin/:$PATH" - -USER 1001 -ENTRYPOINT [ "jupyterhub" ] diff --git a/bitnami/jupyterhub/3/debian-11/docker-compose.yml b/bitnami/jupyterhub/3/debian-11/docker-compose.yml deleted file mode 100644 index 5ba647c16da8..000000000000 --- a/bitnami/jupyterhub/3/debian-11/docker-compose.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: '2' -services: - jupyterhub: - image: docker.io/bitnami/jupyterhub:3 - entrypoint: ["tail", "-f", "/dev/null"] - ports: - - 8081:8081 diff --git a/bitnami/jupyterhub/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jupyterhub/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index fdd151246cab..000000000000 --- a/bitnami/jupyterhub/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "jupyterhub": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "3.1.1-6" - }, - "miniconda": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "4.12.0-164" - } -} \ No newline at end of file diff --git a/bitnami/jupyterhub/3/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/jupyterhub/3/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index 8373a19703c6..000000000000 --- a/bitnami/jupyterhub/3/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt +++ /dev/null @@ -1,3 +0,0 @@ -Bitnami containers ship with software bundles. You can find the licenses at: -https://bitnami.com/open-source -/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/jupyterhub/3/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/jupyterhub/3/debian-11/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index 77857a1a57f2..000000000000 --- a/bitnami/jupyterhub/3/debian-11/prebuildfs/usr/sbin/install_packages +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -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/3/debian-11/tags-info.yaml b/bitnami/jupyterhub/3/debian-11/tags-info.yaml deleted file mode 100644 index 2da46ecf393f..000000000000 --- a/bitnami/jupyterhub/3/debian-11/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rolling-tags: -- "3" -- 3-debian-11 -- 3.1.1