2.4.34-debian-9-r8 release

Add non-root logic

bitnami/apache/2.4/debian-9/Dockerfile

@@ -1,20 +1,27 @@
 FROM bitnami/minideb-extras:stretch-r87
 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 libc6 libexpat1 libffi6 libgmp10 libgnutls30 libhogweed4 libidn11 libldap-2.4-2 libnettle6 libp11-kit0 libpcre3 libsasl2-2 libssl1.1 libtasn1-6 zlib1g
-RUN bitnami-pkg unpack apache-2.4.34-0 --checksum 56464e0931e05066036f43ef56a7c5c3d2a5ddad85eebd62748e3223e6289ace
+RUN bitnami-pkg unpack apache-2.4.34-1 --checksum 35ab4cfd39577d1e7c5f6ef815ff27940add60ba498f7db7e558085de57b9ee3
 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="443" \
-    APACHE_HTTP_PORT_NUMBER="80" \
+ENV APACHE_HTTPS_PORT_NUMBER="8443" \
+    APACHE_HTTP_PORT_NUMBER="8080" \
     BITNAMI_APP_NAME="apache" \
-    BITNAMI_IMAGE_VERSION="2.4.34-debian-9-r7" \
+    BITNAMI_IMAGE_VERSION="2.4.34-debian-9-r8" \
     PATH="/opt/bitnami/apache/bin:$PATH"
 
-EXPOSE 80 443
+EXPOSE 8080 8443
 
 WORKDIR /app
+USER 1001
 ENTRYPOINT ["/app-entrypoint.sh"]
-CMD ["nami","start","--foreground","apache"]
+CMD ["/run.sh"]

bitnami/apache/2.4/debian-9/docker-compose.yml

@@ -4,8 +4,8 @@ services:
   apache:
     image: 'bitnami/apache:2.4'
     ports:
-      - '80:80'
-      - '443:443'
+      - '80:8080'
+      - '443:8443'
     volumes:
       - 'apache_data:/bitnami'
 volumes:

bitnami/apache/2.4/debian-9/rootfs/app-entrypoint.sh

@@ -5,7 +5,7 @@
 
 print_welcome_page
 
-if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then
   nami_initialize apache
   info "Starting apache... "
 fi

bitnami/apache/2.4/debian-9/rootfs/run.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+
+DAEMON=httpd
+EXEC=$(which "$DAEMON")
+
+ARGS="-f /opt/bitnami/apache/conf/httpd.conf -D FOREGROUND"
+
+info "Starting ${DAEMON}..."
+exec ${EXEC} ${ARGS}

bitnami/apache/README.md

@@ -34,7 +34,7 @@ $ docker-compose up -d
 
 * [`2.4-rhel-7`, `2.4.34-rhel-7-r1` (2.4/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/2.4.34-rhel-7-r1/2.4/rhel-7/Dockerfile)
 * [`2.4-ol-7`, `2.4.34-ol-7-r9` (2.4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/2.4.34-ol-7-r9/2.4/ol-7/Dockerfile)
-* [`2.4-debian-9`, `2.4.34-debian-9-r7`, `2.4`, `2.4.34`, `2.4.34-r7`, `latest` (2.4/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/2.4.34-debian-9-r7/2.4/Dockerfile)
+* [`2.4-debian-9`, `2.4.34-debian-9-r8`, `2.4`, `2.4.34`, `2.4.34-r8`, `latest` (2.4/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/2.4.34-debian-9-r8/2.4/Dockerfile)
 
 # Get this image
 

bitnami/apache/circle.yml

@@ -9,8 +9,8 @@ jobs:
           LATEST_STABLE: "2.4"
           DISTRIBUTIONS_LIST: "debian-9,ol-7,rhel-7"
           IMAGE_NAME: apache
-          CHART_NAME:
-          CHART_REPO:
+          CHART_NAME: apache
+          CHART_REPO: https://github.com/bitnami/charts
           DOCKER_PROJECT: bitnami
           QUAY_PROJECT: bitnami
           GCLOUD_PROJECT: bitnami-containers