From 06af5c322d4c2894ec61f9bc8010103089f08fd9 Mon Sep 17 00:00:00 2001 From: David Gomez Date: Tue, 29 Mar 2022 12:16:17 +0200 Subject: [PATCH] Deprecate python 3.6 (#21) Signed-off-by: David Gomez --- bitnami/python/3.6/debian-10/Dockerfile | 29 ------------------- .../python/3.6/debian-10/docker-compose.yml | 10 ------- .../opt/bitnami/.bitnami_components.json | 9 ------ .../opt/bitnami/licenses/licenses.txt | 3 -- .../prebuildfs/usr/sbin/install_packages | 24 --------------- bitnami/python/README.md | 4 --- 6 files changed, 79 deletions(-) delete mode 100644 bitnami/python/3.6/debian-10/Dockerfile delete mode 100644 bitnami/python/3.6/debian-10/docker-compose.yml delete mode 100644 bitnami/python/3.6/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/python/3.6/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/python/3.6/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/python/3.6/debian-10/Dockerfile b/bitnami/python/3.6/debian-10/Dockerfile deleted file mode 100644 index b34afac408c3..000000000000 --- a/bitnami/python/3.6/debian-10/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM docker.io/bitnami/minideb:buster -LABEL maintainer "Bitnami " - -ENV OS_ARCH="amd64" \ - OS_FLAVOUR="debian-10" \ - OS_NAME="linux" - -COPY prebuildfs / -# Install required system packages and dependencies -RUN install_packages build-essential ca-certificates curl git gzip libbz2-1.0 libc6 libffi6 liblzma5 libncursesw6 libreadline7 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libtinfo6 pkg-config procps tar unzip wget zlib1g -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/python-3.6.15-12-linux-amd64-debian-10.tar.gz && \ - echo "2c36e48d094b876ac15ccd5c08f04ce4cf2eb12d4480217c006360070f084d23 /tmp/bitnami/pkg/cache/python-3.6.15-12-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/python-3.6.15-12-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/python-3.6.15-12-linux-amd64-debian-10.tar.gz -RUN apt-get update && apt-get upgrade -y && \ - rm -r /var/lib/apt/lists /var/cache/apt/archives -RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ - sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ - sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password - -ENV APP_VERSION="3.6.15" \ - BITNAMI_APP_NAME="python" \ - BITNAMI_IMAGE_VERSION="3.6.15-debian-10-r194" \ - PATH="/opt/bitnami/python/bin:$PATH" - -EXPOSE 8000 - -WORKDIR /app -CMD [ "python" ] diff --git a/bitnami/python/3.6/debian-10/docker-compose.yml b/bitnami/python/3.6/debian-10/docker-compose.yml deleted file mode 100644 index fa71e1b436c7..000000000000 --- a/bitnami/python/3.6/debian-10/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: '2' - -services: - python: - tty: true # Enables debugging capabilities when attached to this container. - image: docker.io/bitnami/python:3.6 - ports: - - 8000:8000 - volumes: - - .:/app diff --git a/bitnami/python/3.6/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/python/3.6/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index 57337fc41568..000000000000 --- a/bitnami/python/3.6/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "python": { - "arch": "amd64", - "digest": "2c36e48d094b876ac15ccd5c08f04ce4cf2eb12d4480217c006360070f084d23", - "distro": "debian-10", - "type": "NAMI", - "version": "3.6.15-12" - } -} \ No newline at end of file diff --git a/bitnami/python/3.6/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/python/3.6/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index c76ba31f3b8a..000000000000 --- a/bitnami/python/3.6/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt +++ /dev/null @@ -1,3 +0,0 @@ -Bitnami containers ship with software bundles. You can find the licenses under: -/opt/bitnami/nami/COPYING -/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/python/3.6/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/python/3.6/debian-10/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index c9577647443b..000000000000 --- a/bitnami/python/3.6/debian-10/prebuildfs/usr/sbin/install_packages +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -set -e -set -u -export DEBIAN_FRONTEND=noninteractive -n=0 -max=2 -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 -rm -r /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/python/README.md b/bitnami/python/README.md index 2a1937b59d0f..b6d9fa1b8a74 100644 --- a/bitnami/python/README.md +++ b/bitnami/python/README.md @@ -162,10 +162,6 @@ or using Docker Compose: $ docker-compose up python ``` -## Branch Deprecation Notice - -Python's branch 3.6 is no longer maintained by upstream and is now internally tagged as to be deprecated. This branch will no longer be released in our catalog a month after this notice is published, but already released container images will still persist in the registries. Valid to be removed starting on: 03-04-2022 - ## Contributing We'd love for you to contribute to this Docker image. You can request new features by creating an [issue](https://github.com/bitnami/bitnami-docker-python/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-python/pulls) with your contribution.