Merge pull request #48 from jdeathe/issue/46

ISSUE 46: Implement HTTPD environment variable.

Author: jdeathe

Dockerfile

@@ -35,13 +35,6 @@ RUN sed -i \
 	-e 's~^;cgi.fix_pathinfo=1$~cgi.fix_pathinfo=1~g' \
 	/etc/php.ini
 
-# -----------------------------------------------------------------------------
-# Enable Apache MPM worker
-# -----------------------------------------------------------------------------
-RUN sed -i \
-	-e 's~#HTTPD=/usr/sbin/httpd.worker~HTTPD=/usr/sbin/httpd.worker~g' \
-	/etc/sysconfig/httpd
-
 # -----------------------------------------------------------------------------
 # Disable mod_php
 # -----------------------------------------------------------------------------
@@ -65,6 +58,29 @@ RUN ln -sf /etc/services-config/httpd/apache-bootstrap.conf /etc/apache-bootstra
 	&& ln -sf /etc/services-config/httpd/conf.d/fcgid.conf /etc/httpd/conf.d/fcgid.conf \
 	&& chmod +x /etc/apache-bootstrap
 
+# -----------------------------------------------------------------------------
+# Set default environment variables used to identify the service container
+# -----------------------------------------------------------------------------
+ENV SERVICE_UNIT_APP_GROUP app-1
+ENV SERVICE_UNIT_LOCAL_ID 1
+ENV SERVICE_UNIT_INSTANCE 1
+
+# -----------------------------------------------------------------------------
+# Set default environment variables used to configure the service container
+# -----------------------------------------------------------------------------
+ENV APACHE_EXTENDED_STATUS_ENABLED false
+ENV APACHE_LOAD_MODULES "authz_user_module log_config_module expires_module deflate_module headers_module setenvif_module mime_module status_module dir_module alias_module"
+ENV APACHE_MOD_SSL_ENABLED false
+ENV APACHE_SERVER_ALIAS ""
+ENV APACHE_SERVER_NAME app-1.local
+ENV APP_HOME_DIR /var/www/app
+ENV DATE_TIMEZONE UTC
+ENV HTTPD /usr/sbin/httpd.worker
+ENV SERVICE_USER app
+ENV SERVICE_USER_GROUP app-www
+ENV SERVICE_USER_PASSWORD ""
+ENV SUEXECUSERGROUP false
+
 EXPOSE 80 8443 443
 
 CMD ["/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]

README.md

@@ -13,7 +13,7 @@ This build of [Apache](https://httpd.apache.org/), (httpd CentOS package), uses
 
 Included in the build are the [EPEL](http://fedoraproject.org/wiki/EPEL) and [IUS](https://ius.io/) repositories. Installed packages include [OpenSSH](http://www.openssh.com/portable.html) secure shell, [vim-minimal](http://www.vim.org/), [elinks](http://elinks.or.cz) (for fullstatus support), PHP [APC](http://pecl.php.net/package/APC), PHP [Memcached](http://pecl.php.net/package/memcached) are installed along with python-setuptools, [supervisor](http://supervisord.org/) and [supervisor-stdout](https://github.com/coderanger/supervisor-stdout).
 
-Supervisor is used to start httpd.worker daemon when a docker container based on this image is run. To enable simple viewing of stdout for the sshd subprocess, supervisor-stdout is included. This allows you to see output from the supervisord controlled subprocesses with ```docker logs <docker-container-name>```.
+Supervisor is used to start httpd.worker daemon when a docker container based on this image is run. To enable simple viewing of stdout for the service's subprocess, supervisor-stdout is included. This allows you to see output from the supervisord controlled subprocesses with ```docker logs <docker-container-name>```.
 
 If enabling and configuring SSH access, it is by public key authentication and, by default, the [Vagrant](http://www.vagrantup.com/) [insecure private key](https://github.com/mitchellh/vagrant/blob/master/keys/vagrant) is required.
 
@@ -38,7 +38,6 @@ $ docker run -d \
   --env "SERVICE_UNIT_APP_GROUP=app-1" \
   --env "SERVICE_UNIT_LOCAL_ID=1" \
   --env "SERVICE_UNIT_INSTANCE=1" \
-  --env "APACHE_SERVER_ALIAS=app-1" \
   --env "APACHE_SERVER_NAME=app-1.local" \
   --env "DATE_TIMEZONE=UTC" \
   -v /var/services-data/apache-php/app-1:/var/www/app \

etc/apache-bootstrap

@@ -19,7 +19,7 @@ OPTS_SERVICE_USER_GROUP_PASSWORD="${SERVICE_USER_GROUP_PASSWORD:-$(get_password
 OPTS_SERVICE_USER_PASSWORD="${SERVICE_USER_PASSWORD:-$(get_password 8)}"
 OPTS_SUEXECUSERGROUP="${SUEXECUSERGROUP:-false}"
 
-if [[ ! -d ${OPTS_APP_HOME_DIR} ]] && [[ -d ${OPTS_APP_HOME_DIR_TEMPLATE} ]]; then
+if [[ ! -d ${OPTS_APP_HOME_DIR} ]] && [[ -d ${APP_HOME_DIR_TEMPLATE} ]]; then
 	echo "Recreate the ${OPTS_APP_HOME_DIR} directory."
 	mkdir -p ${OPTS_APP_HOME_DIR}
 fi
@@ -39,8 +39,27 @@ if [[ ${OPTS_APP_HOME_DIR} != /var/www/app ]]; then
 	unlink /home/app && ln -s ${OPTS_APP_HOME_DIR} /home/app
 fi
 
+# Server MPM
+HTTPD_MPM_PREFORK=/usr/sbin/httpd
+HTTPD_MPM_WORKER=/usr/sbin/httpd.worker
+HTTPD=${HTTPD:-${HTTPD_MPM_PREFORK}}
+if [[ ${HTTPD} == ${HTTPD_MPM_PREFORK} ]]; then
+	echo "Apache Server MPM: Prefork"
+	sed -i \
+	-e "s~HTTPD=${HTTPD_MPM_WORKER}~#HTTPD=${HTTPD_MPM_WORKER}~g" \
+	/etc/sysconfig/httpd
+elif [[ ${HTTPD} == ${HTTPD_MPM_WORKER} ]]; then
+	echo "Apache Server MPM: Worker"
+	sed -i \
+	-e "s~#HTTPD=${HTTPD_MPM_WORKER}~HTTPD=${HTTPD_MPM_WORKER}~g" \
+	/etc/sysconfig/httpd
+else
+	echo "ERROR: Apache Server MPM (${HTTPD}) unknown."
+	exit 1
+fi
+
 # If users need to change the vhost.conf the SSL version can be rebuilt if it is deleted
-if [[ ${OPTS_APACHE_MOD_SSL_ENABLED} == "true" ]] && [[ ! -f ${OPTS_APP_HOME_DIR}/vhost-ssl.conf ]] && [[ -f ${OPTS_APP_HOME_DIR}/vhost.conf ]]; then
+if [[ ${OPTS_APACHE_MOD_SSL_ENABLED} == true ]] && [[ ! -f ${OPTS_APP_HOME_DIR}/vhost-ssl.conf ]] && [[ -f ${OPTS_APP_HOME_DIR}/vhost.conf ]]; then
 	echo "Rebuilding the SSL VirtualHost configuration."
 	cp -pf ${OPTS_APP_HOME_DIR}/vhost.conf ${OPTS_APP_HOME_DIR}/vhost-ssl.conf
 

etc/services-config/httpd/apache-bootstrap.conf

@@ -21,6 +21,7 @@ APACHE_LOAD_MODULES="${APACHE_LOAD_MODULES:-${APACHE_LOAD_MODULES_DEFAULT}}"
 APACHE_MOD_SSL_ENABLED="${APACHE_MOD_SSL_ENABLED:-false}"
 APP_HOME_DIR="${APP_HOME_DIR:-/var/www/app}"
 DATE_TIMEZONE="${DATE_TIMEZONE:-UTC}"
+HTTPD="${HTTPD:-/usr/sbin/httpd}"
 SERVICE_USER="${SERVICE_USER:-app}"
 SERVICE_USER_GROUP="${SERVICE_USER_GROUP:-app-www}"
 SERVICE_USER_GROUP_PASSWORD=""

etc/services-config/supervisor/supervisord.conf

@@ -33,7 +33,7 @@ stdout_events_enabled = true
 
 [program:httpd]
 priority = 100
-command = /bin/bash -c "/bin/sleep 2 && /usr/sbin/httpd.worker -c \"ErrorLog /dev/stdout\" -DFOREGROUND"
+command = /bin/bash -c "/bin/sleep 2 && %(ENV_HTTPD)s -c \"ErrorLog /dev/stdout\" -DFOREGROUND"
 redirect_stderr = true
 stdout_logfile = /var/log/httpd/error_log
 stdout_events_enabled = true

run.conf

@@ -28,4 +28,5 @@ DOCKER_NAME=${SERVICE_UNIT_NAME}.${SERVICE_UNIT_APP_GROUP}.${SERVICE_UNIT_LOCAL_
 
 VOLUME_CONFIG_NAME=volume-config.${DOCKER_NAME}
 
-APACHE_MOD_SSL_ENABLED=false
+APACHE_MOD_SSL_ENABLED=false
+HTTPD=/usr/sbin/httpd.worker

run.sh

@@ -82,14 +82,6 @@ if ! have_docker_container_name ${VOLUME_CONFIG_NAME}; then
 	if [[ -z $(find ${CONTAINER_MOUNT_PATH_CONFIG}/supervisor -maxdepth 1 -type f) ]]; then
 		CMD=$(cp -R etc/services-config/supervisor ${CONTAINER_MOUNT_PATH_CONFIG}/)
 		$CMD || sudo $CMD
-	else
-		# In case the supervisor configuration exists from the mod_php parent container
-		if [[ $(uname) == Darwin ]]; then
-			CMD=$(sed -i '' -e 's~/usr/sbin/httpd ~/usr/sbin/httpd.worker ~g' ${CONTAINER_MOUNT_PATH_CONFIG}/supervisor/supervisord.conf)
-		else 
-			CMD=$(sed -i -e 's~/usr/sbin/httpd ~/usr/sbin/httpd.worker ~g' ${CONTAINER_MOUNT_PATH_CONFIG}/supervisor/supervisord.conf)
-		fi
-		$CMD || sudo $CMD
 	fi
 
 	if [[ ! -d ${CONTAINER_MOUNT_PATH_CONFIG}/httpd ]]; then
@@ -167,6 +159,7 @@ docker run \
 	--env "APACHE_MOD_SSL_ENABLED=false" \
 	--env "APP_HOME_DIR=${APP_HOME_DIR}" \
 	--env "DATE_TIMEZONE=UTC" \
+	--env "HTTPD=${HTTPD}" \
 	--env "SERVICE_USER=app" \
 	--env "SERVICE_USER_GROUP=app-www" \
 	--env "SERVICE_USER_PASSWORD=" \
@@ -196,6 +189,7 @@ docker run \
 # 	--env "APACHE_MOD_SSL_ENABLED=false" \
 # 	--env "APP_HOME_DIR=/var/www/app-1" \
 # 	--env "DATE_TIMEZONE=Europe/London" \
+# 	--env "HTTPD=/usr/sbin/httpd.worker" \
 # 	--env "SERVICE_USER=app" \
 # 	--env "SERVICE_USER_GROUP=app-www" \
 # 	--env "SERVICE_USER_PASSWORD=" \
@@ -206,6 +200,6 @@ docker run \
 # )
 
 if is_docker_container_name_running ${DOCKER_NAME}; then
-	docker ps | awk -v pattern="${DOCKER_NAME}$" '$NF ~ pattern { print $0 ; }'
+	docker ps | awk -v pattern="${DOCKER_NAME}$" '$NF ~ pattern { print $0; }'
 	echo " ---> Docker container running."
 fi