From 38998e9f5f2590643f8a7f873dba7fda243f6133 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Mon, 4 Jun 2018 14:44:20 +0000
Subject: [PATCH] 2.4.33-ol-7-r4 release

Maintenance release
---
 bitnami/apache/2.4/ol-7/Dockerfile            | 21 +++++++------------
 bitnami/apache/2.4/ol-7/docker-compose.yml    |  6 ++----
 .../apache/2.4/ol-7/rootfs/app-entrypoint.sh  |  2 +-
 bitnami/apache/README.md                      |  2 +-
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/bitnami/apache/2.4/ol-7/Dockerfile b/bitnami/apache/2.4/ol-7/Dockerfile
index d4baa33102c4..9d89ecc701f8 100644
--- a/bitnami/apache/2.4/ol-7/Dockerfile
+++ b/bitnami/apache/2.4/ol-7/Dockerfile
@@ -1,27 +1,20 @@
-FROM bitnami/oraclelinux-extras:7
+FROM bitnami/oraclelinux-extras:7-r5
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
-ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
-    BITNAMI_PKG_EXTRA_DIRS="/bitnami/apache/conf /opt/bitnami/apache/tmp /opt/bitnami/apache/conf" \
-    HOME="/"
-
 # Install required system packages and dependencies
 RUN install_packages cyrus-sasl-lib expat glibc keyutils-libs krb5-libs libcom_err libselinux nspr nss nss-softokn-freebl nss-util openldap openssl-libs pcre zlib
-RUN bitnami-pkg unpack apache-2.4.33-3 --checksum 0611709446389dbf1b9a08ee4b8b447443e356e286a9c6dee312d55f72e465d6
+RUN bitnami-pkg unpack apache-2.4.33-4 --checksum 4e8daac4fc3f70870a856be2dbabe35c060bae4319da105a1cd38ea2335cc5a1
 RUN ln -sf /opt/bitnami/apache/htdocs /app
-RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/access_log
-RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/error_log
 
 COPY rootfs /
-ENV APACHE_HTTPS_PORT_NUMBER="8443" \
-    APACHE_HTTP_PORT_NUMBER="8080" \
+ENV APACHE_HTTPS_PORT_NUMBER="443" \
+    APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="apache" \
-    BITNAMI_IMAGE_VERSION="2.4.33-r3" \
+    BITNAMI_IMAGE_VERSION="2.4.33-ol-7-r4" \
     PATH="/opt/bitnami/apache/bin:$PATH"
 
-EXPOSE 8080 8443
+EXPOSE 80 443
 
 WORKDIR /app
-USER 1001
 ENTRYPOINT ["/app-entrypoint.sh"]
-CMD ["httpd","-f","/bitnami/apache/conf/httpd.conf","-DFOREGROUND"]
+CMD ["nami","start","--foreground","apache"]
diff --git a/bitnami/apache/2.4/ol-7/docker-compose.yml b/bitnami/apache/2.4/ol-7/docker-compose.yml
index e8b9a36bff56..df01f888e2aa 100644
--- a/bitnami/apache/2.4/ol-7/docker-compose.yml
+++ b/bitnami/apache/2.4/ol-7/docker-compose.yml
@@ -3,11 +3,9 @@ version: '2'
 services:
   apache:
     image: 'bitnami/apache:2.4-ol-7'
-    labels:
-      kompose.service.type: nodeport
     ports:
-      - '80:8080'
-      - '443:8443'
+      - '80:80'
+      - '443:443'
     volumes:
       - 'apache_data:/bitnami'
 volumes:
diff --git a/bitnami/apache/2.4/ol-7/rootfs/app-entrypoint.sh b/bitnami/apache/2.4/ol-7/rootfs/app-entrypoint.sh
index aa5910d4b316..8051b1ed33a8 100755
--- a/bitnami/apache/2.4/ol-7/rootfs/app-entrypoint.sh
+++ b/bitnami/apache/2.4/ol-7/rootfs/app-entrypoint.sh
@@ -5,7 +5,7 @@
 
 print_welcome_page
 
-if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "httpd" ]]; then
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
   nami_initialize apache
   info "Starting apache... "
 fi
diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md
index a50436cb39aa..3731f4f5c814 100644
--- a/bitnami/apache/README.md
+++ b/bitnami/apache/README.md
@@ -30,7 +30,7 @@ $ docker-compose up -d
 # Supported tags and respective `Dockerfile` links
 
 * [`2.4`, `2.4.33-r38`, `latest` (2.4/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/2.4.33-r38/2.4/Dockerfile)
-* [`2.4-ol-7`, `2.4.33-ol-7-r3` (2.4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/2.4.33-ol-7-r3/2.4/ol-7/Dockerfile)
+* [`2.4-ol-7`, `2.4.33-ol-7-r4` (2.4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/2.4.33-ol-7-r4/2.4/ol-7/Dockerfile)
 * [`2.4-rhel-7`, `2.4.33-rhel-7-r3` (2.4/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/2.4.33-rhel-7-r3/2.4/rhel-7/Dockerfile)
 
 # Get this image