From dbfa3d3b411a1f378d56c2282e646a8bda239b3d Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 17 Jan 2020 08:37:22 +0000
Subject: [PATCH] 2.4.41-ol-7-r170 release

---
 bitnami/apache/2.4/ol-7/Dockerfile                     |  3 ++-
 .../apache/2.4/ol-7/prebuildfs/build/install-gosu.sh   | 10 ++++++++++
 bitnami/apache/README.md                               |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100755 bitnami/apache/2.4/ol-7/prebuildfs/build/install-gosu.sh

diff --git a/bitnami/apache/2.4/ol-7/Dockerfile b/bitnami/apache/2.4/ol-7/Dockerfile
index a09603197721..3d8634d75559 100644
--- a/bitnami/apache/2.4/ol-7/Dockerfile
+++ b/bitnami/apache/2.4/ol-7/Dockerfile
@@ -12,12 +12,13 @@ RUN install_packages ca-certificates curl cyrus-sasl-lib expat glibc gzip hostna
 RUN . ./libcomponent.sh && component_unpack "apache" "2.4.41-4" --checksum f776f87e3c54a2ff1e13ed75de39356df465b53ac3264a94c3d6ad9252f5b682
 RUN yum upgrade -y && \
     rm -r /var/cache/yum
+RUN /build/install-gosu.sh
 RUN curl --silent -L https://github.com/bitnami/render-template/releases/download/v1.0/render-template.zip > /tmp/render-template.zip && echo "60334a29f9692659f9d3a5d9659f2a97de1f5e7a0fc2e84c1868fdba7f160a9d /tmp/render-template.zip" | sha256sum --check && unzip -q -d /usr/local/bin -o /tmp/render-template.zip render-template && mkdir -p /opt/bitnami/licenses && curl --silent -L https://raw.githubusercontent.com/bitnami/render-template/master/COPYING > /opt/bitnami/licenses/render-template-1.0.txt
 
 COPY rootfs /
 RUN /postunpack.sh
 ENV BITNAMI_APP_NAME="apache" \
-    BITNAMI_IMAGE_VERSION="2.4.41-ol-7-r169" \
+    BITNAMI_IMAGE_VERSION="2.4.41-ol-7-r170" \
     PATH="/opt/bitnami/apache/bin:$PATH"
 
 EXPOSE 8080 8443
diff --git a/bitnami/apache/2.4/ol-7/prebuildfs/build/install-gosu.sh b/bitnami/apache/2.4/ol-7/prebuildfs/build/install-gosu.sh
new file mode 100755
index 000000000000..1756700daa89
--- /dev/null
+++ b/bitnami/apache/2.4/ol-7/prebuildfs/build/install-gosu.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+VERSION="1.11"
+SHA256="0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7"
+
+curl --silent -L "https://github.com/tianon/gosu/releases/download/${VERSION}/gosu-amd64" > "/usr/local/bin/gosu"
+echo "$SHA256" "/usr/local/bin/gosu" | sha256sum --check
+chmod u+x "/usr/local/bin/gosu"
+mkdir -p "/opt/bitnami/licenses"
+curl --silent -L "https://raw.githubusercontent.com/tianon/gosu/master/LICENSE" > "/opt/bitnami/licenses/gosu-${VERSION}.txt"
diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md
index c23ea2b25181..98ef9b93fb71 100644
--- a/bitnami/apache/README.md
+++ b/bitnami/apache/README.md
@@ -45,7 +45,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/).
 
 
-* [`2.4-ol-7`, `2.4.41-ol-7-r169` (2.4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.41-ol-7-r169/2.4/ol-7/Dockerfile)
+* [`2.4-ol-7`, `2.4.41-ol-7-r170` (2.4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.41-ol-7-r170/2.4/ol-7/Dockerfile)
 * [`2.4-debian-9`, `2.4.41-debian-9-r136`, `2.4`, `2.4.41`, `2.4.41-r136`, `latest` (2.4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.41-debian-9-r136/2.4/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/apache GitHub repo](https://github.com/bitnami/bitnami-docker-apache).