Merge pull request #25 from jdeathe/master

Release changes ready for centos-6-1.3.0

Author: jdeathe

Dockerfile

@@ -4,14 +4,17 @@
 # CentOS-6, Apache 2.2, PHP 5.3, PHP memcached 1.0, PHP APC 3.1, Composer
 # 
 # =============================================================================
-FROM jdeathe/centos-ssh-apache-php:centos-6
+FROM jdeathe/centos-ssh-apache-php:centos-6-1.3.0
 
 MAINTAINER James Deathe <james.deathe@gmail.com>
 
 # -----------------------------------------------------------------------------
 # FastCGI support
 # -----------------------------------------------------------------------------
 RUN yum --setopt=tsflags=nodocs -y install \
+	fcgi-2.4.0-12.el6 \
+	mod_fcgid-2.3.9-1.el6 \
+	&& yum versionlock add \
 	fcgi \
 	mod_fcgid \
 	&& rm -rf /var/cache/yum/* \
@@ -48,14 +51,8 @@ RUN mv /etc/httpd/conf.d/php.conf /etc/httpd/conf.d/php.conf.off \
 # -----------------------------------------------------------------------------
 # Add the PHP Wrapper script
 # -----------------------------------------------------------------------------
-RUN mkdir -p /var/www/app/bin
-ADD var/www/app/bin/php-wrapper /var/www/app/bin/
-
-# -----------------------------------------------------------------------------
-# Set permissions & add to the template directory
-# -----------------------------------------------------------------------------
-RUN chmod -R 750 /var/www/app/bin \
-	&& cp -rpf /var/www/app/bin /var/www/.app-skel/bin
+ADD var/www/app-bin/php-wrapper /var/www/app-bin/
+RUN chmod -R 750 /var/www/app-bin
 
 # -----------------------------------------------------------------------------
 # Copy files into place

README.md

@@ -1,7 +1,7 @@
 centos-ssh-apache-php-fcgi
 ==========================
 
-Docker Image including CentOS-6, Apache 2.2, PHP 5.3, PHP memcached 1.0, PHP APC 3.1, Composer.
+Docker Image including CentOS-6 6.6 x86_64, Apache 2.2, PHP 5.3, PHP memcached 1.0, PHP APC 3.1, Composer.
 
 Apache (mod_fcgid) loads only a minimal set of modules by default. Supports custom configuration via a configuration data volume.
 
@@ -56,7 +56,7 @@ Create the data volume, mounting our docker host's configuration directory to */
 ```
 $ docker run \
   --name volume-config.apache-php.app-1.1.1 \
-  -v /etc/services-config/ssh.pool-1:/etc/services-config/ssh \
+  -v /etc/services-config/ssh.pool-1/ssh:/etc/services-config/ssh \
   -v /etc/services-config/apache-php.app-1.1.1/supervisor:/etc/services-config/supervisor \
   -v /etc/services-config/apache-php.app-1.1.1/httpd:/etc/services-config/httpd \
   -v /etc/services-config/apache-php.app-1.1.1/ssl/certs:/etc/services-config/ssl/certs \

apache-php.app-1.1.1@8080.service

@@ -35,7 +35,7 @@ ExecStartPre=/bin/sudo /bin/bash -c \
   if [ ! \"volume-config.%p\" == \"$(/usr/bin/docker ps -a | /bin/grep -v -e \\\"volume-config.%p/.*,.*\\\" | /bin/grep -e '[ ]\{1,\}'volume-config.%p | /bin/grep -o volume-config.%p)\" ]; then \
     /usr/bin/docker run \
       --name volume-config.%p \
-      -v /etc/services-config/ssh.pool-1:/etc/services-config/ssh \
+      -v /etc/services-config/ssh.pool-1/ssh:/etc/services-config/ssh \
       -v /etc/services-config/%p/supervisor:/etc/services-config/supervisor \
       -v /etc/services-config/%p/httpd:/etc/services-config/httpd \
       -v /etc/services-config/%p/ssl/certs:/etc/services-config/ssl/certs \
@@ -47,10 +47,10 @@ ExecStartPre=/bin/sudo /bin/bash -c \
 # Initialisation: Pull or build image if required
 ExecStartPre=/bin/sudo /bin/bash -c \
   "if [ ! \"jdeathe/centos-ssh-apache-php-fcgi\" == \"$(/usr/bin/docker images | /bin/grep -e '^jdeathe/centos-ssh-apache-php-fcgi[ ]\{1,\}' | /bin/grep -o 'jdeathe/centos-ssh-apache-php-fcgi')\" ]; then \
-    if [ -f /var/services-packages/jdeathe/centos-ssh-apache-php-fcgi.centos-6-1.2.1.tar.xz ]; then \
-      /usr/bin/xz -dc /var/services-packages/jdeathe/centos-ssh-apache-php-fcgi.centos-6-1.2.1.tar.xz | /usr/bin/docker load; \
+    if [ -f /var/services-packages/jdeathe/centos-ssh-apache-php-fcgi.centos-6-1.3.0.tar.xz ]; then \
+      /usr/bin/xz -dc /var/services-packages/jdeathe/centos-ssh-apache-php-fcgi.centos-6-1.3.0.tar.xz | /usr/bin/docker load; \
     else \
-      /usr/bin/docker pull jdeathe/centos-ssh-apache-php-fcgi:centos-6-1.2.1; \
+      /usr/bin/docker pull jdeathe/centos-ssh-apache-php-fcgi:centos-6-1.3.0; \
     fi; \
   fi"
 
@@ -75,7 +75,7 @@ ExecStart=/bin/sudo /bin/bash -c \
     --env DATE_TIMEZONE=UTC \
     --volumes-from volume-config.%p \
     -v /var/services-data/apache-php/app-1:/var/www/app \
-    jdeathe/centos-ssh-apache-php-fcgi:centos-6-1.2.1"
+    jdeathe/centos-ssh-apache-php-fcgi:centos-6-1.3.0"
 
 ExecStartPost=/usr/bin/etcdctl set /services/apache-php/app-1/1.1 %H:%i
 

build.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 # Change working directory
-DIR_PATH="$( cd "$( echo "${0%/*}" )"; pwd )"
-if [[ $DIR_PATH == */* ]]; then
+DIR_PATH="$( if [ "$( echo "${0%/*}" )" != "$( echo "${0}" )" ] ; then cd "$( echo "${0%/*}" )"; fi; pwd )"
+if [[ $DIR_PATH == */* ]] && [[ $DIR_PATH != "$( pwd )" ]] ; then
 	cd $DIR_PATH
 fi
 
@@ -12,11 +12,11 @@ source build.conf
 
 show_docker_image ()
 {
-	NAME=$1
-	NAME_PARTS=(${NAME//:/ })
+	local NAME=$1
+	local NAME_PARTS=(${NAME//:/ })
 
 	# Set 'latest' tag if no tag requested
-	if [ ${#NAME_PART[@]} == 1 ]; then
+	if [ ${#NAME_PARTS[@]} == 1 ]; then
 		NAME_PARTS[1]='latest'
 	fi
 

etc/apache-bootstrap

@@ -24,21 +24,12 @@ fi
 if [[ ! -n $(find ${APP_HOME_DIR} -maxdepth 1 -type f) ]] && [[ -d ${APP_HOME_DIR_TEMPLATE} ]]; then
 	echo Home directory ${APP_HOME_DIR} exists but is empty - populate it using ${APP_HOME_DIR_TEMPLATE}...
 	cp -rf ${APP_HOME_DIR_TEMPLATE}/. ${APP_HOME_DIR}/
-elif [[ ! -d ${APP_HOME_DIR}/bin || ! -n $(find ${APP_HOME_DIR}/bin -maxdepth 1 -type f) ]] && [[ -d ${APP_HOME_DIR_TEMPLATE}/bin ]]; then
-	echo Home directory ${APP_HOME_DIR}/bin is missing or empty empty - populate it using ${APP_HOME_DIR_TEMPLATE}/bin...
-	cp -rf ${APP_HOME_DIR_TEMPLATE}/bin ${APP_HOME_DIR}/
-elif [[ ! -d ${APP_HOME_DIR}/public_html ]]; then
-	echo ERROR: ${APP_HOME_DIR}/public_html not found.
-	exit 1
 fi
 
-# Correct permissions (750) must be set on the bin directory and the php-wrapper
-if [[ ! "$(stat -c %a ${APP_HOME_DIR}/bin)" == "750" ]]; then
-	echo ERROR: Permissions on ${APP_HOME_DIR}/bin must be 750...
-#	exit 1
-elif [[ ! "$(stat -c %a ${APP_HOME_DIR}/bin/php-wrapper)" == "750" ]]; then
-	echo ERROR: Permissions on ${APP_HOME_DIR}/bin/php-wrapper must be 750...
-#	exit 1
+# Document root directory is required
+if [[ ! -d ${APP_HOME_DIR}/public_html ]]; then
+	echo ERROR: ${APP_HOME_DIR}/public_html not found.
+	exit 1
 fi
 
 # If users need to change the vhost.conf the SSL version can be rebuilt if it is deleted
@@ -56,7 +47,7 @@ if [[ ${OPTS_APACHE_MOD_SSL_ENABLED} == "true" ]] && [[ ! -f ${APP_HOME_DIR}/vho
 		-e 's~#SSLCipherSuite \(.*\)$~SSLCipherSuite \1~g' \
 		-e 's~#SSLCertificateFile \(.*\)$~SSLCertificateFile \1~g' \
 		-e 's~#SSLCertificateKeyFile \(.*\)$~SSLCertificateKeyFile \1~g' \
-		/var/www/app/vhost-ssl.conf
+		${APP_HOME_DIR}/vhost-ssl.conf
 fi
 
 # Enable/Disable SSL support
@@ -66,7 +57,7 @@ if [[ ${OPTS_APACHE_MOD_SSL_ENABLED} == "true" ]]; then
 
 	sed -i \
 		-e 's~^#NameVirtualHost \*:443$~NameVirtualHost \*:443~g' \
-		-e 's~^#Include /var/www/app/vhost-ssl.conf$~Include /var/www/app/vhost-ssl.conf~g' \
+		-e 's~^#Include ${APP_HOME_DIR}/vhost-ssl.conf$~Include ${APP_HOME_DIR}/vhost-ssl.conf~g' \
 		/etc/httpd/conf/httpd.conf
 
 	if [[ ! -f /etc/services-config/ssl/private/localhost.key ]] || [[ ! -f /etc/services-config/ssl/certs/localhost.crt ]]; then
@@ -85,7 +76,7 @@ else
 
 	sed -i \
 		-e 's~^NameVirtualHost \*:443$~#NameVirtualHost \*:443~g' \
-		-e 's~^Include /var/www/app/vhost-ssl.conf$~#Include /var/www/app/vhost-ssl.conf~g' \
+		-e 's~^Include ${APP_HOME_DIR}/vhost-ssl.conf$~#Include ${APP_HOME_DIR}/vhost-ssl.conf~g' \
 		/etc/httpd/conf/httpd.conf
 fi
 
@@ -100,17 +91,23 @@ fi
 
 # Set the Apache (run) service user/group
 if [[ ${OPTS_SUEXECUSERGROUP} == "true" ]]; then
-	sed -i -e "s~^User .*$~User ${OPTS_SERVICE_USER_GROUP}~g" -e "s~^Group .*$~Group ${OPTS_SERVICE_USER_GROUP}~g" -e "s~^LogLevel warn$~LogLevel debug~g" /etc/httpd/conf/httpd.conf
-	sed -i -e 's~#SuexecUserGroup \(.*\)$~SuexecUserGroup \1~g' /var/www/app/vhost.conf
-	sed -i -e 's~#SuexecUserGroup \(.*\)$~SuexecUserGroup \1~g' /var/www/app/vhost-ssl.conf
-	chown -R 502:502 /var/{www/app/bin,www/.app-skel/bin,run/mod_fcgid}
+	sed -i -e "s~^User .*$~User ${OPTS_SERVICE_USER_GROUP}~g" \
+		-e "s~^Group .*$~Group ${OPTS_SERVICE_USER_GROUP}~g" /etc/httpd/conf/httpd.conf
+	sed -i -e 's~#SuexecUserGroup \(.*\)$~SuexecUserGroup \1~g' ${APP_HOME_DIR}/vhost.conf
+	sed -i -e 's~#SuexecUserGroup \(.*\)$~SuexecUserGroup \1~g' ${APP_HOME_DIR}/vhost-ssl.conf
+	chown -R 502:502 /var/{www/app-bin,run/mod_fcgid}
 else
-	sed -i -e "s~^User .*$~User apache~g" -e "s~^Group .*$~Group apache~g" /etc/httpd/conf/httpd.conf
-	sed -i -e 's~\([^#]\)SuexecUserGroup \(.*\)$~\1#SuexecUserGroup \2~g' /var/www/app/vhost.conf
-	sed -i -e 's~\([^#]\)SuexecUserGroup \(.*\)$~\1#SuexecUserGroup \2~g' /var/www/app/vhost-ssl.conf
-	chown -R apache:apache /var/{www/app/bin,www/.app-skel/bin,run/mod_fcgid}
+	sed -i -e "s~^User .*$~User apache~g" \
+		-e "s~^Group .*$~Group apache~g" /etc/httpd/conf/httpd.conf
+	sed -i -e 's~\([^#]\)SuexecUserGroup \(.*\)$~\1#SuexecUserGroup \2~g' ${APP_HOME_DIR}/vhost.conf
+	sed -i -e 's~\([^#]\)SuexecUserGroup \(.*\)$~\1#SuexecUserGroup \2~g' ${APP_HOME_DIR}/vhost-ssl.conf
+	chown -R apache:apache /var/{www/app-bin,run/mod_fcgid}
 fi
 
+# Update any existing instances of php-wrapper path in the Virtual Host
+sed -i -e 's~app/bin/php-wrapper~app-bin/php-wrapper~g' ${APP_HOME_DIR}/vhost.conf
+sed -i -e 's~app/bin/php-wrapper~app-bin/php-wrapper~g' ${APP_HOME_DIR}/vhost-ssl.conf
+
 echo Loading Apache modules...
 for MODULE in ${APACHE_LOAD_MODULES}
 do
@@ -124,16 +121,15 @@ done
 echo "${OPTS_SERVICE_USER}:${OPTS_SERVICE_USER_PASSWORD}" | chpasswd
 echo "${OPTS_SERVICE_USER_GROUP}:${OPTS_SERVICE_USER_GROUP_PASSWORD}" | chpasswd
 
-echo
-echo "================================================================================"
-echo "Apache Credentials"
-echo "--------------------------------------------------------------------------------"
-echo "${OPTS_SERVICE_USER} : ${OPTS_SERVICE_USER_PASSWORD}"
-echo "${OPTS_SERVICE_USER_GROUP} : ${OPTS_SERVICE_USER_GROUP_PASSWORD}"
-echo "--------------------------------------------------------------------------------"
-echo
-
-# Allow some time for supervisor_stdout to start
-sleep 2
+	cat <<-EOT
+
+		================================================================================
+		Apache Credentials
+		--------------------------------------------------------------------------------
+		${OPTS_SERVICE_USER} : ${OPTS_SERVICE_USER_PASSWORD}
+		${OPTS_SERVICE_USER_GROUP} : ${OPTS_SERVICE_USER_GROUP_PASSWORD}
+		--------------------------------------------------------------------------------
+		
+	EOT
 
 exit 0

etc/services-config/httpd/conf.d/php.conf.default

@@ -0,0 +1,28 @@
+#
+# PHP is an HTML-embedded scripting language which attempts to make it
+# easy for developers to write dynamically generated webpages.
+#
+<IfModule prefork.c>
+  LoadModule php5_module modules/libphp5.so
+</IfModule>
+<IfModule worker.c>
+  LoadModule php5_module modules/libphp5-zts.so
+</IfModule>
+
+#
+# Cause the PHP interpreter to handle files with a .php extension.
+#
+AddHandler php5-script .php
+AddType text/html .php
+
+#
+# Add index.php to the list of files that will be served as directory
+# indexes.
+#
+DirectoryIndex index.php
+
+#
+# Uncomment the following line to allow PHP to pretty-print .phps
+# files as PHP source code:
+#
+#AddType application/x-httpd-php-source .phps

etc/services-config/httpd/conf.d/php.conf.off

@@ -0,0 +1,28 @@
+#
+# PHP is an HTML-embedded scripting language which attempts to make it
+# easy for developers to write dynamically generated webpages.
+#
+<IfModule prefork.c>
+  LoadModule php5_module modules/libphp5.so
+</IfModule>
+<IfModule worker.c>
+  LoadModule php5_module modules/libphp5-zts.so
+</IfModule>
+
+#
+# Cause the PHP interpreter to handle files with a .php extension.
+#
+AddHandler php5-script .php
+AddType text/html .php
+
+#
+# Add index.php to the list of files that will be served as directory
+# indexes.
+#
+DirectoryIndex index.php
+
+#
+# Uncomment the following line to allow PHP to pretty-print .phps
+# files as PHP source code:
+#
+#AddType application/x-httpd-php-source .phps