From c1ef9007b2b90f8737e362472d78a495df0eca15 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 15 Jan 2020 15:05:48 +0000 Subject: [PATCH] 13.0.1-ol-7-r81-prod release --- bitnami/java/13-prod/ol-7/Dockerfile | 11 ++++--- .../prebuildfs/usr/local/bin/install_packages | 29 +++++++++++++++++++ bitnami/java/README.md | 2 +- 3 files changed, 37 insertions(+), 5 deletions(-) create mode 100755 bitnami/java/13-prod/ol-7/prebuildfs/usr/local/bin/install_packages diff --git a/bitnami/java/13-prod/ol-7/Dockerfile b/bitnami/java/13-prod/ol-7/Dockerfile index 192e6f07dcb6..2187c025861e 100644 --- a/bitnami/java/13-prod/ol-7/Dockerfile +++ b/bitnami/java/13-prod/ol-7/Dockerfile @@ -1,17 +1,20 @@ -FROM bitnami/java:13.0.1-ol-7-r79 as development +FROM bitnami/java:13.0.1-ol-7-r80 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 ca-certificates glibc wget zlib +RUN install_packages ca-certificates curl glibc gzip hostname libaio-devel procps-ng sudo tar which zlib +RUN yum upgrade -y && \ + rm -r /var/cache/yum COPY --from=development /opt/bitnami/java /opt/bitnami/java ENV BITNAMI_APP_NAME="java" \ - BITNAMI_IMAGE_VERSION="13.0.1-ol-7-r80-prod" \ + BITNAMI_IMAGE_VERSION="13.0.1-ol-7-r81-prod" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:$PATH" diff --git a/bitnami/java/13-prod/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/java/13-prod/ol-7/prebuildfs/usr/local/bin/install_packages new file mode 100755 index 000000000000..370f3516f403 --- /dev/null +++ b/bitnami/java/13-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/java/README.md b/bitnami/java/README.md index 099f9035d4b8..c5afc805516a 100644 --- a/bitnami/java/README.md +++ b/bitnami/java/README.md @@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t - [`13`, `13.0.1-photon-3-r0` (13/photon-3/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.1-photon-3-r0/13/photon-3/Dockerfile), [`13-prod`, `13.0.1-photon-3-r0-prod` (13/photon-3/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.1-photon-3-r0/13/photon-3/prod/Dockerfile) -- [`13`, `13.0.1-ol-7-r80-prod` (13/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.1-ol-7-r80-prod/13/ol-7/Dockerfile), [`13-prod`, `13.0.1-ol-7-r80-prod-prod` (13/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.1-ol-7-r80-prod/13/ol-7/prod/Dockerfile) +- [`13`, `13.0.1-ol-7-r81-prod` (13/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.1-ol-7-r81-prod/13/ol-7/Dockerfile), [`13-prod`, `13.0.1-ol-7-r81-prod-prod` (13/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.1-ol-7-r81-prod/13/ol-7/prod/Dockerfile) - [`13`, `13.0.1-ol-7-r80` (13/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.1-ol-7-r80/13/ol-7/Dockerfile), [`13-prod`, `13.0.1-ol-7-r80-prod` (13/ol-7/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.1-ol-7-r80/13/ol-7/prod/Dockerfile) - [`13`, `13.0.1-debian-9-r70` (13/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.1-debian-9-r70/13/debian-9/Dockerfile), [`13-prod`, `13.0.1-debian-9-r70-prod` (13/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.1-debian-9-r70/13/debian-9/prod/Dockerfile) - [`13`, `13.0.1-debian-9-r62-prod` (13/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.1-debian-9-r62-prod/13/debian-9/Dockerfile), [`13-prod`, `13.0.1-debian-9-r62-prod-prod` (13/debian-9/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.1-debian-9-r62-prod/13/debian-9/prod/Dockerfile)