diff --git a/bitnami/logstash/7/ol-7/Dockerfile b/bitnami/logstash/7/ol-7/Dockerfile index fe34417a7975..2397f97b0d2d 100644 --- a/bitnami/logstash/7/ol-7/Dockerfile +++ b/bitnami/logstash/7/ol-7/Dockerfile @@ -16,7 +16,7 @@ RUN curl --silent -L https://github.com/tianon/gosu/releases/download/1.11/gosu- COPY rootfs / RUN /postunpack.sh ENV BITNAMI_APP_NAME="logstash" \ - BITNAMI_IMAGE_VERSION="7.4.2-ol-7-r23" \ + BITNAMI_IMAGE_VERSION="7.4.2-ol-7-r24" \ PATH="/opt/bitnami/logstash/bin:/opt/bitnami/java/bin:$PATH" EXPOSE 8080 diff --git a/bitnami/logstash/7/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/logstash/7/ol-7/prebuildfs/usr/local/bin/install_packages index 4218ab93690a..370f3516f403 100755 --- a/bitnami/logstash/7/ol-7/prebuildfs/usr/local/bin/install_packages +++ b/bitnami/logstash/7/ol-7/prebuildfs/usr/local/bin/install_packages @@ -1,20 +1,29 @@ #!/bin/sh -set -e -set -u -n=0 +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 -until [ $n -gt $max ]; do +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 -eq 0 ]; then + if (( $CODE == 0 )); then break fi - if [ $n -eq $max ]; then + if (( $n == $max )); then exit $CODE fi echo "yum failed, retrying" - n=$(($n + 1)) done rm -r /var/cache/yum diff --git a/bitnami/logstash/README.md b/bitnami/logstash/README.md index 0300872ef57c..a60e56255c86 100644 --- a/bitnami/logstash/README.md +++ b/bitnami/logstash/README.md @@ -44,7 +44,7 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/). -* [`7-ol-7`, `7.4.2-ol-7-r23` (7/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-logstash/blob/7.4.2-ol-7-r23/7/ol-7/Dockerfile) +* [`7-ol-7`, `7.4.2-ol-7-r24` (7/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-logstash/blob/7.4.2-ol-7-r24/7/ol-7/Dockerfile) * [`7-debian-9`, `7.4.2-debian-9-r2`, `7`, `7.4.2`, `7.4.2-r2`, `latest` (7/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-logstash/blob/7.4.2-debian-9-r2/7/debian-9/Dockerfile) * [`7-centos-7`, `7.4.2-centos-7-r0` (7/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-logstash/blob/7.4.2-centos-7-r0/7/centos-7/Dockerfile)