From 03e8269edace8d45729d97453b8e140d50b6cf8f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 27 May 2020 19:24:43 +0000 Subject: [PATCH] 2.7.18-prod-debian-10-r36 release --- bitnami/python/2-prod/debian-10/Dockerfile | 22 ++++++++++------- .../2-prod/debian-10/docker-compose.yml | 2 +- .../opt/bitnami/licenses/licenses.txt | 3 +++ .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++++ bitnami/python/README.md | 2 +- 5 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 bitnami/python/2-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt create mode 100755 bitnami/python/2-prod/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/python/2-prod/debian-10/Dockerfile b/bitnami/python/2-prod/debian-10/Dockerfile index b41f38afb34b..fcf568e26770 100644 --- a/bitnami/python/2-prod/debian-10/Dockerfile +++ b/bitnami/python/2-prod/debian-10/Dockerfile @@ -1,23 +1,27 @@ -FROM bitnami/python:2.7.18-debian-10-r40 as development - -###### - FROM docker.io/bitnami/minideb:buster LABEL maintainer "Bitnami " +COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl libbz2-1.0 libc6 libncursesw6 libreadline7 libsqlite3-0 libssl1.1 libtinfo6 procps sudo unzip zlib1g +RUN install_packages ca-certificates curl gzip libbz2-1.0 libc6 libncursesw6 libreadline7 libsqlite3-0 libssl1.1 libtinfo6 procps tar wget zlib1g +RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/python-2.7.18-1-linux-amd64-debian-10.tar.gz && \ + echo "17b4780e0980d7059eb2bb687dc07e90c102596ed573cf11bc05a5382b92baa0 /tmp/bitnami/pkg/cache/python-2.7.18-1-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ + tar -zxf /tmp/bitnami/pkg/cache/python-2.7.18-1-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ + rm -rf /tmp/bitnami/pkg/cache/python-2.7.18-1-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 -COPY --from=development /opt/bitnami/licenses /opt/bitnami/licenses -COPY --from=development /opt/bitnami/python /opt/bitnami/python - ENV BITNAMI_APP_NAME="python" \ - BITNAMI_IMAGE_VERSION="2.7.18-debian-10-r35-prod" \ + BITNAMI_IMAGE_VERSION="2.7.18-prod-debian-10-r36" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" \ PATH="/opt/bitnami/python/bin:$PATH" +EXPOSE 8000 + +WORKDIR /app CMD [ "python" ] diff --git a/bitnami/python/2-prod/debian-10/docker-compose.yml b/bitnami/python/2-prod/debian-10/docker-compose.yml index 6617b6516f2d..41bcf757b1d0 100644 --- a/bitnami/python/2-prod/debian-10/docker-compose.yml +++ b/bitnami/python/2-prod/debian-10/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: python: tty: true # Enables debugging capabilities when attached to this container. - image: 'bitnami/python:2-prod' + image: 'docker.io/bitnami/python:2-prod-debian-10' ports: - 8000:8000 volumes: diff --git a/bitnami/python/2-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/python/2-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 000000000000..c76ba31f3b8a --- /dev/null +++ b/bitnami/python/2-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,3 @@ +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/2-prod/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/python/2-prod/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/python/2-prod/debian-10/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,24 @@ +#!/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 d48ea942225a..0a0897d04a20 100644 --- a/bitnami/python/README.md +++ b/bitnami/python/README.md @@ -40,7 +40,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`3.7-debian-10`, `3.7.7-debian-10-r86`, `3.7`, `3.7.7`, `latest` (3.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.7.7-debian-10-r86/3.7/debian-10/Dockerfile) * [`3.6-prod-debian-10`, `3.6-debian-10-prod`, `3.6.10-prod-debian-10-r122`, `3.6.10-debian-10-r122-prod`, `3.6-prod`, `3.6.10-prod` (3.6-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.6.10-prod-debian-10-r122/3.6-prod/debian-10/Dockerfile) * [`3.6-debian-10`, `3.6.10-debian-10-r129`, `3.6`, `3.6.10` (3.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.6.10-debian-10-r129/3.6/debian-10/Dockerfile) -* [`2-prod-debian-10`, `2-debian-10-prod`, `2.7.18-prod-debian-10-r35`, `2.7.18-debian-10-r35-prod`, `2-prod`, `2.7.18-prod` (2-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/2.7.18-prod-debian-10-r35/2-prod/debian-10/Dockerfile) +* [`2-prod-debian-10`, `2-debian-10-prod`, `2.7.18-prod-debian-10-r36`, `2.7.18-debian-10-r36-prod`, `2-prod`, `2.7.18-prod` (2-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/2.7.18-prod-debian-10-r36/2-prod/debian-10/Dockerfile) * [`2-debian-10`, `2.7.18-debian-10-r41`, `2`, `2.7.18` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/2.7.18-debian-10-r41/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/python GitHub repo](https://github.com/bitnami/bitnami-docker-python).