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

Release changes for 1.10.4

Author: jdeathe

CHANGELOG.md

@@ -6,6 +6,10 @@ Summary of release changes for Version 1.
 
 CentOS-6 6.9 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1.
 
+### 1.10.4 - 2018-01-29
+
+- Updates image source to [release 1.10.4](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.4).
+
 ### 1.10.3 - 2018-01-16
 
 - Updates image source to [release 1.10.3](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.3).

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:1.10.3
+FROM jdeathe/centos-ssh-apache-php:1.10.4
 
 # -----------------------------------------------------------------------------
 # FastCGI support
@@ -46,7 +46,7 @@ ENV APACHE_MPM="worker"
 # -----------------------------------------------------------------------------
 # Set image metadata
 # -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="1.10.3"
+ARG RELEASE_VERSION="1.10.4"
 LABEL \
 	maintainer="James Deathe <james.deathe@gmail.com>" \
 	install="docker run \

README.md

@@ -7,9 +7,9 @@ Apache PHP web server, loading only a minimal set of Apache modules by default.
 
 ## Overview & links
 
-The latest CentOS-6 based release can be pulled from the centos-6 Docker tag. For a specific release tag the convention is `centos-6-1.10.3` or `1.10.3` for the [1.10.3](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.7.0) release tag.
+The latest CentOS-6 based release can be pulled from the centos-6 Docker tag. For a specific release tag the convention is `centos-6-1.10.4` or `1.10.4` for the [1.10.4](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/tree/1.7.0) release tag.
 
-- `centos-6`, `centos-6-1.10.3`, `1.10.3` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile)
+- `centos-6`, `centos-6-1.10.4`, `1.10.4` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-apache-php-fcgi/blob/centos-6/Dockerfile)
 
 This build of [Apache](https://httpd.apache.org/), (httpd CentOS package), uses the [mod_fcgid](https://httpd.apache.org/mod_fcgid/) module to run [PHP](http://php.net/) as a [FastCGI](http://www.fastcgi.com/) process.
 
@@ -87,10 +87,10 @@ $ docker run \
   --volume /:/media/root \
   --env BASH_ENV="" \
   --env ENV="" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.10.3 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.4 \
   /usr/sbin/scmi install \
     --chroot=/media/root \
-    --tag=1.10.3 \
+    --tag=1.10.4 \
     --name=apache-php.pool-1.1.1
 ```
 
@@ -105,10 +105,10 @@ $ docker run \
   --volume /:/media/root \
   --env BASH_ENV="" \
   --env ENV="" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.10.3 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.4 \
   /usr/sbin/scmi uninstall \
     --chroot=/media/root \
-    --tag=1.10.3 \
+    --tag=1.10.4 \
     --name=apache-php.pool-1.1.1
 ```
 
@@ -123,10 +123,10 @@ $ docker run \
   --volume /:/media/root \
   --env BASH_ENV="" \
   --env ENV="" \
-  jdeathe/centos-ssh-apache-php-fcgi:1.10.3 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.4 \
   /usr/sbin/scmi install \
     --chroot=/media/root \
-    --tag=1.10.3 \
+    --tag=1.10.4 \
     --name=apache-php.pool-1.1.1 \
     --manager=systemd \
     --register \
@@ -150,7 +150,7 @@ To see detailed information about the image run `scmi` with the `--info` option.
 $ eval "sudo -E $(
     docker inspect \
     -f "{{.ContainerConfig.Labels.install}}" \
-    jdeathe/centos-ssh-apache-php-fcgi:1.10.3
+    jdeathe/centos-ssh-apache-php-fcgi:1.10.4
   ) --info"
 ```
 
@@ -160,7 +160,7 @@ To perform an installation using the docker name `apache-php.pool-1.2.1` simply
 $ eval "sudo -E $(
     docker inspect \
     -f "{{.ContainerConfig.Labels.install}}" \
-    jdeathe/centos-ssh-apache-php-fcgi:1.10.3
+    jdeathe/centos-ssh-apache-php-fcgi:1.10.4
   ) --name=apache-php.pool-1.2.1"
 ```
 
@@ -170,7 +170,7 @@ To uninstall use the *same command* that was used to install but with the `unins
 $ eval "sudo -E $(
     docker inspect \
     -f "{{.ContainerConfig.Labels.uninstall}}" \
-    jdeathe/centos-ssh-apache-php-fcgi:1.10.3
+    jdeathe/centos-ssh-apache-php-fcgi:1.10.4
   ) --name=apache-php.pool-1.2.1"
 ```
 
@@ -181,15 +181,15 @@ With the addition of install/uninstall image labels it is possible to use [Proje
 _NOTE:_ A prerequisite of the following examples is that the image has been pulled (or loaded from the release package).
 
 ```
-$ docker pull jdeathe/centos-ssh-apache-php-fcgi:1.10.3
+$ docker pull jdeathe/centos-ssh-apache-php-fcgi:1.10.4
 ```
 
 To see detailed information about the image run `scmi` with the `--info` option. To see all available `scmi` options run with the `--help` option.
 
 ```
 $ sudo -E atomic install \
   -n apache-php.pool-1.3.1 \
-  jdeathe/centos-ssh-apache-php-fcgi:1.10.3 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.4 \
   --info
 ```
 
@@ -198,14 +198,14 @@ To perform an installation using the docker name `apache-php.pool-1.3.1` simply
 ```
 $ sudo -E atomic install \
   -n apache-php.pool-1.3.1 \
-  jdeathe/centos-ssh-apache-php-fcgi:1.10.3
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.4
 ```
 
 Alternatively, you could use the `scmi` options `--name` or `-n` for naming the container.
 
 ```
 $ sudo -E atomic install \
-  jdeathe/centos-ssh-apache-php-fcgi:1.10.3 \
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.4 \
   --name apache-php.pool-1.3.1
 ```
 
@@ -214,7 +214,7 @@ To uninstall use the *same command* that was used to install but with the `unins
 ```
 $ sudo -E atomic uninstall \
   -n apache-php.pool-1.3.1 \
-  jdeathe/centos-ssh-apache-php-fcgi:1.10.3
+  jdeathe/centos-ssh-apache-php-fcgi:1.10.4
 ```
 
 #### Environment Variables
@@ -267,8 +267,8 @@ The Apache ErrorLog can be defined using `APACHE_ERROR_LOG_LOCATION` to set a fi
 
 ```
 ...
-  --env "APACHE_CUSTOM_LOG_LOCATION=/var/log/httpd/error_log" \
-  --env "APACHE_CUSTOM_LOG_FORMAT=error" \
+  --env "APACHE_ERROR_LOG_LOCATION=/var/log/httpd/error_log" \
+  --env "APACHE_ERROR_LOG_FORMAT=error" \
 ...
 ```
 

src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service

@@ -52,7 +52,7 @@ Environment="DOCKER_USER=jdeathe"
 Environment="DOCKER_CONTAINER_OPTS="
 Environment="DOCKER_IMAGE_PACKAGE_PATH=/var/opt/scmi/packages"
 Environment="DOCKER_IMAGE_NAME=centos-ssh-apache-php-fcgi"
-Environment="DOCKER_IMAGE_TAG=1.10.3"
+Environment="DOCKER_IMAGE_TAG=1.10.4"
 Environment="DOCKER_PORT_MAP_TCP_80=8080"
 Environment="DOCKER_PORT_MAP_TCP_443=9443"
 Environment="DOCKER_PORT_MAP_TCP_8443=NULL"

test/shpec/operation_shpec.sh

@@ -686,6 +686,7 @@ function test_custom_configuration ()
 	local curl_session_name=""
 	local header_x_service_operating_mode=""
 	local header_x_service_uid=""
+	local is_up=""
 	local php_date_timezone=""
 	local protocol=""
 
@@ -2047,16 +2048,23 @@ function test_custom_configuration ()
 
 			# Healthcheck should fail unless running PHP-FPM without Apache.
 			it "Can disable httpd-bootstrap."
+				is_up="1"
+
 				docker ps \
-					--format "name=apache-php.pool-1.1.1" \
-				&> /dev/null \
-				&& docker top \
+					--quiet \
+					--filter "name=apache-php.pool-1.1.1" \
+					--filter "health=unhealthy" \
+				&> /dev/null
+				is_up="${?}"
+
+				docker top \
 					apache-php.pool-1.1.1 \
+				&> /dev/null \
 				| grep -qE '/usr/sbin/httpd(\.worker|\.event)? '
 
 				assert equal \
-					"${?}" \
-					"1"
+					"${is_up}:${?}" \
+					"0:1"
 			end
 
 			__terminate_container \
@@ -2073,17 +2081,22 @@ function test_custom_configuration ()
 			sleep ${STARTUP_TIME}
 
 			it "Can disable httpd-wrapper."
+				is_up="1"
+
 				docker ps \
-					--format "name=apache-php.pool-1.1.1" \
-					--format "health=healthy" \
-				&> /dev/null \
-				&& docker top \
+					--filter "name=apache-php.pool-1.1.1" \
+					--filter "health=healthy" \
+				&> /dev/null
+				is_up="${?}"
+
+				docker top \
 					apache-php.pool-1.1.1 \
+				&> /dev/null \
 				| grep -qE '/usr/sbin/httpd(\.worker|\.event)? '
 
 				assert equal \
-					"${?}" \
-					"1"
+					"${is_up}:${?}" \
+					"0:1"
 			end
 
 			__terminate_container \