From a48a5c4be616f3430ab4f3880825a17904a67438 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Mon, 13 Feb 2017 16:58:30 +0530
Subject: [PATCH 1/2] config: move default config var to Dockerfile

---
 bitnami/apache/Dockerfile               | 15 ++++++++++-----
 bitnami/apache/rootfs/app-entrypoint.sh |  4 ----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/bitnami/apache/Dockerfile b/bitnami/apache/Dockerfile
index 4991b35de1c0..f55e1a8b634d 100644
--- a/bitnami/apache/Dockerfile
+++ b/bitnami/apache/Dockerfile
@@ -10,16 +10,21 @@ RUN install_packages libssl1.0.0 libaprutil1 libapr1 libc6 libuuid1 libexpat1 li
 
 # Install apache
 RUN bitnami-pkg unpack apache-2.4.25-0 --checksum 8b46af7d737772d7d301da8b30a2770b7e549674e33b8a5b07480f53c39f5c3f
-RUN ln -sf /opt/bitnami/$BITNAMI_APP_NAME/htdocs /app
+RUN ln -sf /opt/bitnami/apache/htdocs /app
 
-ENV PATH=/opt/bitnami/$BITNAMI_APP_NAME/sbin:/opt/bitnami/$BITNAMI_APP_NAME/bin:/opt/bitnami/common/bin:$PATH
+ENV PATH=/opt/bitnami/apache/sbin:/opt/bitnami/apache/bin:/opt/bitnami/common/bin:$PATH
 
 COPY rootfs/ /
-ENTRYPOINT ["/app-entrypoint.sh"]
-CMD ["nami", "start", "--foreground", "apache"]
 
-VOLUME ["/bitnami/$BITNAMI_APP_NAME"]
+ENV APACHE_HTTP_PORT=80 \
+    APACHE_HTTPS_PORT=443
+
+VOLUME ["/bitnami/apache"]
 
 WORKDIR /app
 
 EXPOSE 80 443
+
+ENTRYPOINT ["/app-entrypoint.sh"]
+
+CMD ["nami", "start", "--foreground", "apache"]
diff --git a/bitnami/apache/rootfs/app-entrypoint.sh b/bitnami/apache/rootfs/app-entrypoint.sh
index 6a411008d29f..f7fd739f8912 100755
--- a/bitnami/apache/rootfs/app-entrypoint.sh
+++ b/bitnami/apache/rootfs/app-entrypoint.sh
@@ -13,10 +13,6 @@ function initialize {
     fi
 }
 
-# Set default values
-export APACHE_HTTP_PORT=${APACHE_HTTP_PORT:-80}
-export APACHE_HTTPS_PORT=${APACHE_HTTPS_PORT:-443}
-
 if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
     initialize apache
     chown -R :$BITNAMI_APP_USER /bitnami/apache || true

From 8ffe8c6309b3f6a6b3ed63adf8c4ed350fab3635 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Mon, 13 Feb 2017 17:07:57 +0530
Subject: [PATCH 2/2] entrypoint: remove references to `entrypoint.sh` from
 base image

---
 bitnami/apache/Dockerfile               | 10 ++++------
 bitnami/apache/rootfs/app-entrypoint.sh | 26 +++++++++----------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/bitnami/apache/Dockerfile b/bitnami/apache/Dockerfile
index f55e1a8b634d..e9cccad17046 100644
--- a/bitnami/apache/Dockerfile
+++ b/bitnami/apache/Dockerfile
@@ -1,9 +1,9 @@
-FROM gcr.io/stacksmith-images/minideb:jessie-r8
+FROM gcr.io/stacksmith-images/minideb:jessie-r9
 MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_IMAGE_VERSION=2.4.25-r1 \
     BITNAMI_APP_NAME=apache \
-    BITNAMI_APP_USER=daemon
+    PATH=/opt/bitnami/apache/bin:$PATH
 
 # System packages required
 RUN install_packages libssl1.0.0 libaprutil1 libapr1 libc6 libuuid1 libexpat1 libpcre3 libldap-2.4-2 libsasl2-2 libgnutls-deb0-28 zlib1g libp11-kit0 libtasn1-6 libnettle4 libhogweed2 libgmp10 libffi6
@@ -12,17 +12,15 @@ RUN install_packages libssl1.0.0 libaprutil1 libapr1 libc6 libuuid1 libexpat1 li
 RUN bitnami-pkg unpack apache-2.4.25-0 --checksum 8b46af7d737772d7d301da8b30a2770b7e549674e33b8a5b07480f53c39f5c3f
 RUN ln -sf /opt/bitnami/apache/htdocs /app
 
-ENV PATH=/opt/bitnami/apache/sbin:/opt/bitnami/apache/bin:/opt/bitnami/common/bin:$PATH
-
 COPY rootfs/ /
 
 ENV APACHE_HTTP_PORT=80 \
     APACHE_HTTPS_PORT=443
 
-VOLUME ["/bitnami/apache"]
-
 WORKDIR /app
 
+VOLUME ["/bitnami/apache"]
+
 EXPOSE 80 443
 
 ENTRYPOINT ["/app-entrypoint.sh"]
diff --git a/bitnami/apache/rootfs/app-entrypoint.sh b/bitnami/apache/rootfs/app-entrypoint.sh
index f7fd739f8912..9c20de6e18a7 100755
--- a/bitnami/apache/rootfs/app-entrypoint.sh
+++ b/bitnami/apache/rootfs/app-entrypoint.sh
@@ -1,22 +1,14 @@
 #!/bin/bash -e
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
 
-function initialize {
-    # Package can be "installed" or "unpacked"
-    status=`nami inspect $1`
-    if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
-        # Clean up inputs
-        inputs=""
-        if [[ -f /$1-inputs.json ]]; then
-            inputs=--inputs-file=/$1-inputs.json
-        fi
-        nami initialize $1 $inputs
-    fi
-}
+print_welcome_page
+check_for_updates &
 
-if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
-    initialize apache
-    chown -R :$BITNAMI_APP_USER /bitnami/apache || true
-    echo "Starting application ..."
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+  nami_initialize apache
+  chown -R :daemon /bitnami/apache || true
+  info "Starting apache..."
 fi
 
-exec /entrypoint.sh "$@"
+exec tini -- "$@"