From 78025ad8b85911837de98e389fa0d5d64fa47fce Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Sun, 4 Oct 2015 14:09:38 +0530
Subject: [PATCH 1/2] the base image prints the welcome page by default

---
 bitnami/apache/rootfs/etc/cont-init.d/01-bitnami-apache | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bitnami/apache/rootfs/etc/cont-init.d/01-bitnami-apache b/bitnami/apache/rootfs/etc/cont-init.d/01-bitnami-apache
index 489b23bbc592..cc2954aba067 100755
--- a/bitnami/apache/rootfs/etc/cont-init.d/01-bitnami-apache
+++ b/bitnami/apache/rootfs/etc/cont-init.d/01-bitnami-apache
@@ -2,8 +2,6 @@
 set -e
 source $BITNAMI_PREFIX/bitnami-utils.sh
 
-print_welcome_page
-
 generate_conf_files
 
 if [ ! "$(ls -A /app)" ]; then

From cff322167ce3ac5390c3151f21c1e6433c402250 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Sun, 4 Oct 2015 14:10:11 +0530
Subject: [PATCH 2/2] use the `entrypoint.sh` script from the base image

---
 bitnami/apache/Dockerfile                       |  1 +
 bitnami/apache/rootfs/entrypoint.sh             | 15 ---------------
 bitnami/apache/rootfs/etc/services.d/apache/run |  2 +-
 3 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100755 bitnami/apache/rootfs/entrypoint.sh

diff --git a/bitnami/apache/Dockerfile b/bitnami/apache/Dockerfile
index b368a6b5e2f7..db6a4342ffc7 100644
--- a/bitnami/apache/Dockerfile
+++ b/bitnami/apache/Dockerfile
@@ -3,6 +3,7 @@ MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_APP_NAME=apache \
     BITNAMI_APP_USER=daemon \
+    BITNAMI_APP_DAEMON=httpd \
     BITNAMI_APP_VERSION=2.4.12-4 \
     BITNAMI_APP_DIR=$BITNAMI_PREFIX/apache2
 
diff --git a/bitnami/apache/rootfs/entrypoint.sh b/bitnami/apache/rootfs/entrypoint.sh
deleted file mode 100755
index bfefa45eebcf..000000000000
--- a/bitnami/apache/rootfs/entrypoint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [ "${1:0:1}" = '-' ]; then
-  export EXTRA_OPTIONS="$@"
-  set --
-elif [ "${1}" == "httpd" -o "${1}" == "$(which httpd)" ]; then
-  export EXTRA_OPTIONS="${@:2}"
-  set --
-fi
-
-if [ -n "${1}" ]; then
-  touch /etc/services.d/$BITNAMI_APP_NAME/down
-fi
-
-exec /init "$@"
diff --git a/bitnami/apache/rootfs/etc/services.d/apache/run b/bitnami/apache/rootfs/etc/services.d/apache/run
index aeb8a3f9bb57..fe0cdb01127f 100755
--- a/bitnami/apache/rootfs/etc/services.d/apache/run
+++ b/bitnami/apache/rootfs/etc/services.d/apache/run
@@ -7,4 +7,4 @@ rm -f $BITNAMI_APP_DIR/logs/httpd.pid
 
 mkdir -p $BITNAMI_APP_DIR/tmp
 date '+%d%H%M%S' > $BITNAMI_APP_DIR/tmp/start
-exec httpd -DFOREGROUND -f $BITNAMI_APP_DIR/conf/httpd.conf ${EXTRA_OPTIONS:+"$EXTRA_OPTIONS"}
+exec $BITNAMI_APP_DAEMON -DFOREGROUND -f $BITNAMI_APP_DIR/conf/httpd.conf ${EXTRA_OPTIONS:+"$EXTRA_OPTIONS"}