Merge pull request #8 from sameersbn/base-image-updates

Base image updates

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
 

bitnami/apache/rootfs/entrypoint.sh

@@ -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 "$@"

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

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"}