Merge pull request #75 from jdeathe/master

Release changes ready for centos-6-1.4.4

Author: jdeathe

Dockerfile

@@ -4,14 +4,16 @@
 # CentOS-6, Apache 2.2, PHP 5.3, PHP Memcached 1.0, PHP APC 3.1.
 # 
 # =============================================================================
-FROM jdeathe/centos-ssh-apache-php:centos-6-1.4.3
+FROM jdeathe/centos-ssh-apache-php:centos-6-1.4.4
 
 MAINTAINER James Deathe <james.deathe@gmail.com>
 
 # -----------------------------------------------------------------------------
 # FastCGI support
 # -----------------------------------------------------------------------------
 RUN rpm --rebuilddb \
+	&& yum -y erase \
+	php-5.3.3-46.el6_6 \
 	&& yum --setopt=tsflags=nodocs -y install \
 	fcgi-2.4.0-12.el6 \
 	mod_fcgid-2.3.9-1.el6 \
@@ -21,72 +23,15 @@ RUN rpm --rebuilddb \
 	&& rm -rf /var/cache/yum/* \
 	&& yum clean all
 
-# -----------------------------------------------------------------------------
-# Apache mime_magic module should be disabled with FastCGI
-# -----------------------------------------------------------------------------
-RUN sed -i \
-	-e 's~^LoadModule mime_magic_module ~#LoadModule mime_magic_module ~g' \
-	/etc/httpd/conf/httpd.conf
-
-# -----------------------------------------------------------------------------
-# Enable the pathinfo fix
-# -----------------------------------------------------------------------------
-RUN sed -i \
-	-e 's~^;cgi.fix_pathinfo=1$~cgi.fix_pathinfo=1~g' \
-	/etc/php.ini
-
-# -----------------------------------------------------------------------------
-# Disable mod_php
-# -----------------------------------------------------------------------------
-RUN mv /etc/httpd/conf.d/php.conf /etc/httpd/conf.d/php.conf.off \
-	&& touch /etc/httpd/conf.d/php.conf \
-	&& chmod 444 /etc/httpd/conf.d/php.conf
-
-# -----------------------------------------------------------------------------
-# Add the PHP Wrapper script
-# -----------------------------------------------------------------------------
-ADD var/www/app-bin/php-wrapper /var/www/app-bin/
-RUN chmod -R 750 /var/www/app-bin
-
 # -----------------------------------------------------------------------------
 # Copy files into place
 # -----------------------------------------------------------------------------
-ADD etc/apache-bootstrap /etc/
-ADD etc/services-config/httpd/apache-bootstrap.conf /etc/services-config/httpd/
 ADD etc/services-config/httpd/conf.d/fcgid.conf /etc/services-config/httpd/conf.d/
-RUN ln -sf /etc/services-config/httpd/apache-bootstrap.conf /etc/apache-bootstrap.conf \
-	&& 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
+RUN ln -sf /etc/services-config/httpd/conf.d/fcgid.conf /etc/httpd/conf.d/fcgid.conf
 
 # -----------------------------------------------------------------------------
 # Set default environment variables used to configure the service container
 # -----------------------------------------------------------------------------
-# ENV APACHE_CONTENT_ROOT /var/www/${PACKAGE_NAME}
-# ENV APACHE_CUSTOM_LOG_FORMAT combined
-# ENV APACHE_CUSTOM_LOG_LOCATION ${APACHE_CONTENT_ROOT}/var/log/apache_access_log
-# ENV APACHE_ERROR_LOG_LOCATION ${APACHE_CONTENT_ROOT}/var/log/apache_error_log
-# ENV APACHE_ERROR_LOG_LEVEL warn
-# 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_PUBLIC_DIRECTORY public_html
-# ENV APACHE_RUN_GROUP app-www
-# ENV APACHE_RUN_USER app-www
-# ENV APACHE_SERVER_ALIAS ""
-# ENV APACHE_SERVER_NAME app-1.local
-# ENV APACHE_SUEXEC_USER_GROUP false
-# ENV APACHE_SYSTEM_USER app
 ENV HTTPD /usr/sbin/httpd.worker
-# ENV PACKAGE_PATH ${PACKAGE_PATH}
-# ENV PHP_OPTIONS_DATE_TIMEZONE UTC
-
-# EXPOSE 80 8443 443
 
 CMD ["/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]

apache-php.app-1.1.1@8080.service

@@ -29,7 +29,7 @@ RestartSec=30
 TimeoutStartSec=1200
 Environment="DOCKER_IMAGE_PACKAGE_PATH=/var/services-packages"
 Environment="DOCKER_IMAGE_NAME=jdeathe/centos-ssh-apache-php-fcgi"
-Environment="DOCKER_IMAGE_TAG=centos-6-1.4.3"
+Environment="DOCKER_IMAGE_TAG=centos-6-1.4.4"
 Environment="SERVICE_UNIT_APP_GROUP=app-1"
 Environment="SERVICE_UNIT_LOCAL_ID=1"
 Environment="SERVICE_UNIT_INSTANCE=1"
@@ -51,7 +51,6 @@ Environment="APACHE_RUN_USER=app-www"
 Environment="APACHE_SERVER_ALIAS=app-1"
 Environment="APACHE_SERVER_HOME=/var/www"
 Environment="APACHE_SERVER_NAME=app-1.local"
-Environment="APACHE_SUEXEC_USER_GROUP=false"
 Environment="APACHE_SYSTEM_USER=app"
 Environment="HTTPD=/usr/sbin/httpd.worker"
 Environment="PHP_OPTIONS_DATE_TIMEZONE=UTC"
@@ -140,7 +139,6 @@ ExecStart=/bin/sudo /bin/bash -c \
       --env \"APACHE_RUN_USER=${APACHE_RUN_USER}\" \
       --env \"APACHE_SERVER_ALIAS=${APACHE_SERVER_ALIAS}\" \
       --env \"APACHE_SERVER_NAME=${APACHE_SERVER_NAME}\" \
-      --env \"APACHE_SUEXEC_USER_GROUP=${APACHE_SUEXEC_USER_GROUP}\" \
       --env \"APACHE_SYSTEM_USER=${APACHE_SYSTEM_USER}\" \
       --env \"HTTPD=${HTTPD}\" \
       --env \"PHP_OPTIONS_DATE_TIMEZONE=${PHP_OPTIONS_DATE_TIMEZONE}\" \

etc/apache-bootstrap

@@ -274,7 +274,6 @@ OPTS_APACHE_RUN_GROUP="${APACHE_RUN_GROUP:-${DEFAULT_APACHE_USER}}"
 OPTS_APACHE_RUN_USER="${APACHE_RUN_USER:-${DEFAULT_APACHE_USER}}"
 OPTS_APACHE_SERVER_ALIAS="${APACHE_SERVER_ALIAS:-}"
 OPTS_APACHE_SERVER_NAME="${APACHE_SERVER_NAME:-$(hostname)}"
-OPTS_APACHE_SUEXEC_USER_GROUP="${APACHE_SUEXEC_USER_GROUP:-false}"
 OPTS_APACHE_SYSTEM_USER="${APACHE_SYSTEM_USER:-${DEFAULT_SYSTEM_USER}}"
 
 # Generate SSL certificate.
@@ -387,7 +386,8 @@ set_apache_server_name ${OPTS_APACHE_SERVER_NAME} 80
 
 # Enable Apache modules
 APACHE_MODULES_ENABLED=$(
-	enable_apache_modules "${OPTS_APACHE_LOAD_MODULES}"
+	enable_apache_modules "${OPTS_APACHE_LOAD_MODULES}" \
+	| sort
 )
 
 # Generate an SSL VirtualHost configuration if required
@@ -413,29 +413,11 @@ else
 	> /etc/httpd/conf.d/ssl.conf
 fi
 
-VIRTUAL_HOST_CONFIGURATION_FILES="${OPTS_APACHE_CONTENT_ROOT}/vhost.conf"
-if [[ ${OPTS_APACHE_MOD_SSL_ENABLED} == true ]]; then
-	VIRTUAL_HOST_CONFIGURATION_FILES+=" ${OPTS_APACHE_CONTENT_ROOT}/vhost-ssl.conf"
-fi
-
-# Set the Apache (run) service user/group
-if [[ ${OPTS_APACHE_SUEXEC_USER_GROUP} == true ]]; then
-	sed -i \
-		-e 's~#SuexecUserGroup \(.*\)$~SuexecUserGroup \1~g' \
-		-e 's~app/bin/php-wrapper~app-bin/php-wrapper~g' \
-		${VIRTUAL_HOST_CONFIGURATION_FILES}
-else
-	sed -i \
-		-e 's~\([^#]\)SuexecUserGroup \(.*\)$~\1#SuexecUserGroup \2~g' \
-		-e 's~app/bin/php-wrapper~app-bin/php-wrapper~g' \
-		${VIRTUAL_HOST_CONFIGURATION_FILES}
-fi
-
 # Set ownership for fcgid php-wrapper and socket if necessary
-if [[ -d /var/www/app-bin && -d /var/run/mod_fcgid ]]; then
+if [[ -d ${PACKAGE_PATH}/bin && -d /var/run/mod_fcgid ]]; then
 	chown -R \
 		${OPTS_APACHE_RUN_USER}:${OPTS_APACHE_RUN_GROUP} \
-		/var/{www/app-bin,run/mod_fcgid}
+		{${PACKAGE_PATH}/bin,/var/run/mod_fcgid}
 fi
 
 # Set the system user's login names and groups

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

@@ -28,7 +28,6 @@ APACHE_RUN_GROUP="${APACHE_RUN_GROUP:-app-www}"
 APACHE_RUN_USER="${APACHE_RUN_USER:-app-www}"
 APACHE_SERVER_ALIAS="${APACHE_SERVER_ALIAS:-}"
 APACHE_SERVER_NAME="${APACHE_SERVER_NAME:-${SERVICE_UNIT_APP_GROUP}.local}"
-APACHE_SUEXEC_USER_GROUP="${APACHE_SUEXEC_USER_GROUP:-false}"
 APACHE_SYSTEM_USER="${APACHE_SYSTEM_USER:-app}"
 HTTPD="${HTTPD:-/usr/sbin/httpd}"
 PHP_OPTIONS_DATE_TIMEZONE="${PHP_OPTIONS_DATE_TIMEZONE:-UTC}"

etc/services-config/httpd/conf.d/fcgid.conf

@@ -7,8 +7,13 @@
 LoadModule fcgid_module modules/mod_fcgid.so
 
 <IfModule mod_fcgid.c>
-        # Use FastCGI to process .fcg .fcgi & .fpl scripts
-        AddHandler fcgid-script fcg fcgi fpl
+        # Use FastCGI to process .fcg .fcgi .fpl & .php scripts
+        AddHandler fcgid-script fcg fcgi fpl php
+        AddType text/html php
+
+        # Add index.php to the list of files that will be served as directory
+        # indexes.
+        DirectoryIndex index.php
 
         # Sane place to put sockets and shared memory file
         FcgidIPCDir /var/run/mod_fcgid