Merge pull request #93 from jdeathe/centos-6-develop

Release changes for 1.6.0

Author: jdeathe

Dockerfile

@@ -4,7 +4,7 @@
 # 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.5.0
+FROM jdeathe/centos-ssh-apache-php:centos-6-1.6.1
 
 MAINTAINER James Deathe <james.deathe@gmail.com>
 
@@ -13,25 +13,16 @@ MAINTAINER James Deathe <james.deathe@gmail.com>
 # -----------------------------------------------------------------------------
 RUN rpm --rebuilddb \
 	&& yum -y erase \
-	php-5.3.3-48.el6_8 \
+		php-5.3.3-48.el6_8 \
 	&& yum --setopt=tsflags=nodocs -y install \
-	fcgi-2.4.0-12.el6 \
-	mod_fcgid-2.3.9-1.el6 \
+		fcgi-2.4.0-12.el6 \
+		mod_fcgid-2.3.9-1.el6 \
 	&& yum versionlock add \
-	fcgi \
-	mod_fcgid \
+		fcgi \
+		mod_fcgid \
 	&& rm -rf /var/cache/yum/* \
 	&& yum clean all
 
-# -----------------------------------------------------------------------------
-# Copy files into place
-# -----------------------------------------------------------------------------
-ADD etc/services-config/httpd/conf.d/fcgid.conf \
-	/etc/services-config/httpd/conf.d/
-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
 # -----------------------------------------------------------------------------

README.md

@@ -19,7 +19,7 @@ If enabling and configuring SSH access, it is by public key authentication and,
 
 ### SSH Alternatives
 
-SSH is not required in order to access a terminal for the running container. The simplest method is to use the docker exec command to run bash (or sh) as follows: 
+SSH is not required in order to access a terminal for the running container. The simplest method is to use the docker exec command to run bash (or sh) as follows:
 
 ```
 $ docker exec -it <docker-name-or-id> bash
@@ -328,6 +328,7 @@ $ docker run -d \
   --env "APACHE_SERVER_NAME=app-1.local" \
   --env "APACHE_MOD_SSL_ENABLED=true" \
   --env "PHP_OPTIONS_DATE_TIMEZONE=UTC" \
+  --env "SERVICE_UID=app-1.1.1" \
   -v volume-data.apache-php.app-1.1.1:/var/www \
   jdeathe/centos-ssh-apache-php-fcgi:latest
 ```
@@ -377,11 +378,11 @@ To set the timezone for the UK and account for British Summer Time you would use
 
 ##### SERVICE_UID
 
-The ```SERVICE_UID``` environmental variable is used to set a response header named ```X-Service-Uid``` that lets you identify the container that is serving the content. This is useful when you have many containers running on a single host using different ports or if you are running a cluster and need to identify which host the content is served from. The default value is set to the Service Unit's App Group Name, Local ID and Instance ID.
+The ```SERVICE_UID``` environmental variable is used to set a response header named ```X-Service-Uid``` that lets you identify the container that is serving the content. This is useful when you have many containers running on a single host using different ports or if you are running a cluster and need to identify which host the content is served from. If the value contains the placeholder `{{HOSTNAME}}` it will be replaced with the system `hostname` value; by default this is the container id but the hostname can be modified using the `--hostname` docker create|run parameter.
 
 ```
 ...
-  --env "SERVICE_UID=app-1.1.1" \
+  --env "SERVICE_UID={{HOSTNAME}}" \
 ...
 ```
 

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.5.0"
+Environment="DOCKER_IMAGE_TAG=centos-6-1.6.0"
 Environment="SERVICE_UNIT_NAME=apache-php"
 Environment="SERVICE_UNIT_APP_GROUP=app-1"
 Environment="SERVICE_UNIT_SHARED_GROUP=pool-1"

apache-php.app-1@.service

@@ -51,7 +51,7 @@ TimeoutStartSec=1200
 Environment="DOCKER_USER=jdeathe"
 Environment="DOCKER_IMAGE_PACKAGE_PATH=/var/services-packages"
 Environment="DOCKER_IMAGE_NAME=centos-ssh-apache-php-fcgi"
-Environment="DOCKER_IMAGE_TAG=centos-6-1.5.0"
+Environment="DOCKER_IMAGE_TAG=centos-6-1.6.0"
 Environment="DOCKER_PORT_MAP_TCP_80=8080"
 Environment="DOCKER_PORT_MAP_TCP_443=9443"
 Environment="DOCKER_PORT_MAP_TCP_8443=8580"
@@ -75,7 +75,7 @@ Environment="APACHE_SERVER_ALIAS=app-1"
 Environment="APACHE_SERVER_HOME=/var/www"
 Environment="APACHE_SERVER_NAME=app-1.local"
 Environment="APACHE_SYSTEM_USER=app"
-Environment="HTTPD=/usr/sbin/httpd"
+Environment="HTTPD=/usr/sbin/httpd.worker"
 Environment="PHP_OPTIONS_DATE_TIMEZONE=UTC"
 Environment="SERVICE_UID=app-1.%i"
 

environment.mk

@@ -2,7 +2,7 @@
 # Constants
 # -----------------------------------------------------------------------------
 DOCKER_USER := jdeathe
-DOCKER_IMAGE_NAME := centos-ssh-apache-php
+DOCKER_IMAGE_NAME := centos-ssh-apache-php-fcgi
 
 # Tag validation patterns
 DOCKER_IMAGE_TAG_PATTERN := ^(latest|(centos-[6-7])|(centos-(6-1|7-2).[0-9]+.[0-9]+))$
@@ -60,6 +60,6 @@ APACHE_RUN_USER ?= app-www
 APACHE_SERVER_ALIAS ?= app-1
 APACHE_SERVER_NAME ?= app-1.local
 APACHE_SYSTEM_USER ?= app
-HTTPD ?= /usr/sbin/httpd
+HTTPD ?= /usr/sbin/httpd.worker
 PHP_OPTIONS_DATE_TIMEZONE ?= UTC
 SERVICE_UID ?= app-1.1.1