diff --git a/bitnami/python/3.6-prod/ol-7/Dockerfile b/bitnami/python/3.6-prod/ol-7/Dockerfile index 7a893f865164..26d1c5a004f6 100644 --- a/bitnami/python/3.6-prod/ol-7/Dockerfile +++ b/bitnami/python/3.6-prod/ol-7/Dockerfile @@ -1,17 +1,20 @@ -FROM bitnami/python:3.6.10-ol-7-r25 as development +FROM bitnami/python:3.6.10-ol-7-r27 as development ###### -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 glibc keyutils-libs krb5-libs libcom_err libffi libselinux ncurses-libs nss-softokn-freebl openssl-libs pcre readline sqlite wget xz-libs zlib +RUN install_packages bzip2-libs ca-certificates curl glibc gzip hostname keyutils-libs krb5-libs libaio-devel libcom_err libffi libselinux ncurses-libs nss-softokn-freebl openssl-libs pcre procps-ng readline sqlite sudo tar which xz-libs zlib +RUN yum upgrade -y && \ + rm -r /var/cache/yum COPY --from=development /opt/bitnami/python /opt/bitnami/python ENV BITNAMI_APP_NAME="python" \ - BITNAMI_IMAGE_VERSION="3.6.10-ol-7-r29-prod" \ + BITNAMI_IMAGE_VERSION="3.6.10-ol-7-r30-prod" \ PATH="/opt/bitnami/python/bin:$PATH" CMD [ "python" ] diff --git a/bitnami/python/3.6-prod/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/python/3.6-prod/ol-7/prebuildfs/usr/local/bin/install_packages new file mode 100755 index 000000000000..370f3516f403 --- /dev/null +++ b/bitnami/python/3.6-prod/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 4880434e1c84..486369c385ba 100644 --- a/bitnami/python/README.md +++ b/bitnami/python/README.md @@ -56,7 +56,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`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-debian-9-prod`, `3.7.6-debian-9-r23-prod`, `3.7-prod`, `3.7.6-prod`, `3.7.6-r23-prod`, `latest-prod` (3.7-prod/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.7.6-debian-9-r23-prod/3.7-prod/debian-9/Dockerfile) * [`3.7-debian-9`, `3.7.6-debian-9-r21`, `3.7`, `3.7.6`, `3.7.6-r21`, `latest` (3.7/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.7.6-debian-9-r21/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) +* [`3.6-ol-7-prod`, `3.6.10-ol-7-r30-prod` (3.6-prod/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.6.10-ol-7-r30-prod/3.6-prod/ol-7/Dockerfile) * [`3.6-ol-7`, `3.6.10-ol-7-r27` (3.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.6.10-ol-7-r27/3.6/ol-7/Dockerfile) * [`3.6-debian-9-prod`, `3.6.10-debian-9-r24-prod`, `3.6-prod`, `3.6.10-prod`, `3.6.10-r24-prod` (3.6-prod/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.6.10-debian-9-r24-prod/3.6-prod/debian-9/Dockerfile) * [`3.6-debian-9`, `3.6.10-debian-9-r21`, `3.6`, `3.6.10`, `3.6.10-r21` (3.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-python/blob/3.6.10-debian-9-r21/3.6/debian-9/Dockerfile)