diff --git a/bitnami/python/3.7/ol-7/Dockerfile b/bitnami/python/3.7/ol-7/Dockerfile index 013ca19e4c1c..3f906c7b9b27 100644 --- a/bitnami/python/3.7/ol-7/Dockerfile +++ b/bitnami/python/3.7/ol-7/Dockerfile @@ -1,15 +1,18 @@ -FROM bitnami/oraclelinux-runtimes:7-r564 +FROM oraclelinux:7-slim LABEL maintainer "Bitnami " +COPY prebuildfs / # Install required system packages and dependencies RUN install_packages bzip2-libs ca-certificates curl gcc gcc-c++ git glibc keyutils-libs krb5-libs libcom_err libffi libselinux libtool make ncurses-libs nss-softokn-freebl openssl-libs patch pcre pkgconfig readline sqlite unzip wget xz-libs zlib RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/python-3.7.6-0-linux-x86_64-ol-7.tar.gz && \ echo "c55f49e7af6fc6c2c10613088822b49a726d4908901f1630ba3536054b06f617 /tmp/bitnami/pkg/cache/python-3.7.6-0-linux-x86_64-ol-7.tar.gz" | sha256sum -c - && \ tar -zxf /tmp/bitnami/pkg/cache/python-3.7.6-0-linux-x86_64-ol-7.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ rm -rf /tmp/bitnami/pkg/cache/python-3.7.6-0-linux-x86_64-ol-7.tar.gz +RUN yum upgrade -y && \ + rm -r /var/cache/yum ENV BITNAMI_APP_NAME="python" \ - BITNAMI_IMAGE_VERSION="3.7.6-ol-7-r25" \ + BITNAMI_IMAGE_VERSION="3.7.6-ol-7-r26" \ PATH="/opt/bitnami/python/bin:$PATH" EXPOSE 8000 diff --git a/bitnami/python/3.7/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/python/3.7/ol-7/prebuildfs/usr/local/bin/install_packages new file mode 100755 index 000000000000..370f3516f403 --- /dev/null +++ b/bitnami/python/3.7/ol-7/prebuildfs/usr/local/bin/install_packages @@ -0,0 +1,29 @@ +#!/bin/sh +set -eu + +if [[ -n "oracle-epel-release-el7" ]]; then + if ! yum list installed oracle-epel-release-el7 >/dev/null 2>&1; then + yum -y install oracle-epel-release-el7 >/dev/null 2>&1 + CODE=$? + if (( $CODE != 0 )); then + echo "EPEL repository installation failed" + exit $CODE + fi + fi +fi + +max=2 +for ((n = 1 ; n <= max ; n+=1 )); do + set +e + yum --enablerepo base,updates,ol7_developer_EPEL,ol7_optional_latest install -y "$@" + CODE=$? + set -e + if (( $CODE == 0 )); then + break + fi + if (( $n == $max )); then + exit $CODE + fi + echo "yum failed, retrying" +done +rm -r /var/cache/yum diff --git a/bitnami/python/README.md b/bitnami/python/README.md index d586d8c707e6..a611c3465d95 100644 --- a/bitnami/python/README.md +++ b/bitnami/python/README.md @@ -52,8 +52,8 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`3.8-ol-7`, `3.8.1-ol-7-r26` (3.8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.8.1-ol-7-r26/3.8/ol-7/Dockerfile) * [`3.8-debian-9-prod`, `3.8.1-debian-9-r20-prod`, `3.8-prod`, `3.8.1-prod`, `3.8.1-r20-prod` (3.8-prod/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.8.1-debian-9-r20-prod/3.8-prod/debian-9/Dockerfile) * [`3.8-debian-9`, `3.8.1-debian-9-r20`, `3.8`, `3.8.1`, `3.8.1-r20` (3.8/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.8.1-debian-9-r20/3.8/debian-9/Dockerfile) +* [`3.7-ol-7`, `3.7.6-ol-7-r26` (3.7/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.7.6-ol-7-r26/3.7/ol-7/Dockerfile) * [`3.7-ol-7-prod`, `3.7.6-ol-7-r25-prod` (3.7-prod/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.7.6-ol-7-r25-prod/3.7-prod/ol-7/Dockerfile) -* [`3.7-ol-7`, `3.7.6-ol-7-r25` (3.7/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.7.6-ol-7-r25/3.7/ol-7/Dockerfile) * [`3.7-debian-9-prod`, `3.7.6-debian-9-r22-prod`, `3.7-prod`, `3.7.6-prod`, `3.7.6-r22-prod`, `latest-prod` (3.7-prod/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.7.6-debian-9-r22-prod/3.7-prod/debian-9/Dockerfile) * [`3.7-debian-9`, `3.7.6-debian-9-r20`, `3.7`, `3.7.6`, `3.7.6-r20`, `latest` (3.7/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.7.6-debian-9-r20/3.7/debian-9/Dockerfile) * [`3.6-ol-7-prod`, `3.6.10-ol-7-r29-prod` (3.6-prod/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.6.10-ol-7-r29-prod/3.6-prod/ol-7/Dockerfile)