Merge pull request #134 from jdeathe/issue/133

CLOSES #133: Updates upstream source to 1.10.3

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.3 - Unreleased
+
+- Updates image source to [release 1.10.3](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.3).
+
 ### 1.10.2 - 2017-12-27
 
 - Updates image source to [release 1.10.2](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.2).

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.2
+FROM jdeathe/centos-ssh-apache-php:1.10.3
 
 # -----------------------------------------------------------------------------
 # FastCGI support

README.md

@@ -136,6 +136,8 @@ $ docker run \
 
 ##### SCMI Fleet Support
 
+**_Deprecation Notice:_** The fleet project is no longer maintained. The fleet `--manager` option has been deprecated in `scmi`.
+
 If your docker host has systemd, fleetd (and optionally etcd) installed then `scmi` provides a method to schedule the container  to run on the cluster. This provides some additional features for managing a group of instances on a [fleet](https://github.com/coreos/fleet) cluster and has the option to use an etcd backed service registry. To use the fleet method of installation use the `-m` or `--manager` option of `scmi` and to include the optional etcd register companion unit use the `--register` option.
 
 ##### SCMI Image Information
@@ -436,8 +438,11 @@ To set the timezone for the UK and account for British Summer Time you would use
 
 Using `PHP_OPTIONS_SESSION_SAVE_HANDLER` and `PHP_OPTIONS_SESSION_SAVE_PATH` together it's possible to configure PHP to use an alternative `session.save_handler` and `session.save_path`. For example if you have a Memcached server running on the host `memcached-server` on the default port `11211` the following configuration will allow session data to be stored in Memcached, allowing session data to be shared between multiple PHP containers.
 
+Using `PHP_OPTIONS_SESSION_NAME` a session name can be defined - otherwise the default name "PHPSESSID" is used.
+
 ```
 ...
+  --env "PHP_OPTIONS_SESSION_NAME=app-session" \
   --env "PHP_OPTIONS_SESSION_SAVE_HANDLER=memcached" \
   --env "PHP_OPTIONS_SESSION_SAVE_PATH=memcached-server:11211" \
 ...

default.mk

@@ -26,6 +26,7 @@ define DOCKER_CONTAINER_PARAMETERS
 --env "APACHE_SSL_PROTOCOL=$(APACHE_SSL_PROTOCOL)" \
 --env "APACHE_SYSTEM_USER=$(APACHE_SYSTEM_USER)" \
 --env "PHP_OPTIONS_DATE_TIMEZONE=$(PHP_OPTIONS_DATE_TIMEZONE)" \
+--env "PHP_OPTIONS_SESSION_NAME=$(PHP_OPTIONS_SESSION_NAME)" \
 --env "PHP_OPTIONS_SESSION_SAVE_HANDLER=$(PHP_OPTIONS_SESSION_SAVE_HANDLER)" \
 --env "PHP_OPTIONS_SESSION_SAVE_PATH=$(PHP_OPTIONS_SESSION_SAVE_PATH)"
 endef

environment.mk

@@ -72,5 +72,6 @@ APACHE_SSL_CIPHER_SUITE ?= ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY
 APACHE_SSL_PROTOCOL ?= All -SSLv2 -SSLv3
 APACHE_SYSTEM_USER ?= app
 PHP_OPTIONS_DATE_TIMEZONE ?= UTC
+PHP_OPTIONS_SESSION_NAME ?= PHPSESSID
 PHP_OPTIONS_SESSION_SAVE_HANDLER ?= files
 PHP_OPTIONS_SESSION_SAVE_PATH ?= /var/lib/php/session

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

@@ -79,6 +79,7 @@ Environment="APACHE_SSL_CIPHER_SUITE=ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHA
 Environment="APACHE_SSL_PROTOCOL=All -SSLv2 -SSLv3"
 Environment="APACHE_SYSTEM_USER=app"
 Environment="PHP_OPTIONS_DATE_TIMEZONE=UTC"
+Environment="PHP_OPTIONS_SESSION_NAME=PHPSESSID"
 Environment="PHP_OPTIONS_SESSION_SAVE_HANDLER=files"
 Environment="PHP_OPTIONS_SESSION_SAVE_PATH=/var/lib/php/session"
 
@@ -133,6 +134,7 @@ ExecStart=/bin/bash -c \
     --env \"APACHE_SSL_PROTOCOL=${APACHE_SSL_PROTOCOL}\" \
     --env \"APACHE_SYSTEM_USER=${APACHE_SYSTEM_USER}\" \
     --env \"PHP_OPTIONS_DATE_TIMEZONE=${PHP_OPTIONS_DATE_TIMEZONE}\" \
+    --env \"PHP_OPTIONS_SESSION_NAME=${PHP_OPTIONS_SESSION_NAME}\" \
     --env \"PHP_OPTIONS_SESSION_SAVE_HANDLER=${PHP_OPTIONS_SESSION_SAVE_HANDLER}\" \
     --env \"PHP_OPTIONS_SESSION_SAVE_PATH=${PHP_OPTIONS_SESSION_SAVE_PATH}\" \
     $(if [[ ${DOCKER_PORT_MAP_TCP_80} != NULL ]]; then \

src/opt/scmi/environment.sh

@@ -76,5 +76,6 @@ APACHE_SSL_CIPHER_SUITE="${APACHE_SSL_CIPHER_SUITE:-"ECDHE-ECDSA-CHACHA20-POLY13
 APACHE_SSL_PROTOCOL="${APACHE_SSL_PROTOCOL:-All -SSLv2 -SSLv3}"
 APACHE_SYSTEM_USER="${APACHE_SYSTEM_USER:-app}"
 PHP_OPTIONS_DATE_TIMEZONE="${PHP_OPTIONS_DATE_TIMEZONE:-UTC}"
+PHP_OPTIONS_SESSION_NAME="${PHP_OPTIONS_SESSION_NAME:-PHPSESSID}"
 PHP_OPTIONS_SESSION_SAVE_HANDLER="${PHP_OPTIONS_SESSION_SAVE_HANDLER:-files}"
 PHP_OPTIONS_SESSION_SAVE_PATH="${PHP_OPTIONS_SESSION_SAVE_PATH:-/var/lib/php/session}"

test/shpec/operation_shpec.sh

@@ -89,7 +89,7 @@ function __setup ()
 	local -r session_store_alias="memcached_1"
 	local -r session_store_name="memcached.pool-1.1.1"
 	local -r session_store_network="bridge_internal_1"
-	local -r session_store_release="1.1.1"
+	local -r session_store_release="1.1.2"
 
 	if [[ -z $(docker network ls -q -f name="${session_store_network}") ]]; then
 		docker network create \
@@ -222,6 +222,7 @@ ${other_required_apache_modules}
 	local container_hostname=""
 	local container_port_80=""
 	local curl_get_request=""
+	local curl_session_name=""
 	local header_server=""
 	local header_x_service_uid=""
 	local status=0
@@ -631,6 +632,25 @@ ${other_required_apache_modules}
 			end
 		end
 
+		describe "PHP options"
+			it "Has default session.name."
+				curl_session_name="$(
+					curl -s \
+						--header 'Host: localhost.localdomain' \
+						http://127.0.0.1:${container_port_80}/_phpinfo.php \
+						| grep 'session.name' \
+						| sed -E \
+							-e 's~^.*(session.name)~\1~' \
+							-e 's~</t(r|d)>~~g' \
+							-e 's~<td[^>]*>~ ~g'
+				)"
+
+				assert equal \
+					"${curl_session_name}" \
+					"session.name PHPSESSID PHPSESSID"
+			end
+		end
+
 		__terminate_container \
 			apache-php.pool-1.1.1 \
 		&> /dev/null
@@ -663,6 +683,7 @@ function test_custom_configuration ()
 	local curl_response_code_server_alias=""
 	local curl_session_data_write=""
 	local curl_session_data_read=""
+	local curl_session_name=""
 	local header_x_service_operating_mode=""
 	local header_x_service_uid=""
 	local php_date_timezone=""
@@ -2010,43 +2031,6 @@ function test_custom_configuration ()
 			end
 		end
 
-		describe "PHP date.timezone"
-			it "Sets to 'Europe/London'."
-				__terminate_container \
-					apache-php.pool-1.1.1 \
-				&> /dev/null
-
-				docker run \
-					--detach \
-					--name apache-php.pool-1.1.1 \
-					--publish ${DOCKER_PORT_MAP_TCP_80}:80 \
-					--env PHP_OPTIONS_DATE_TIMEZONE="Europe/London" \
-					jdeathe/centos-ssh-apache-php-fcgi:latest \
-				&> /dev/null
-
-				if ! __is_container_ready \
-					apache-php.pool-1.1.1 \
-					${STARTUP_TIME} \
-					"/usr/sbin/httpd(\.worker|\.event)? " \
-					"[[ 000 != \$(curl -sI -o /dev/null -w %{http_code} localhost/) ]]"
-				then
-					exit 1
-				fi
-
-				php_date_timezone="$(
-					docker exec \
-						apache-php.pool-1.1.1 \
-						php \
-							-r \
-							"printf('%s', ini_get('date.timezone'));"
-				)"
-
-				assert equal \
-					"${php_date_timezone}" \
-					"Europe/London"
-			end
-		end
-
 		describe "Configure autostart"
 			__terminate_container \
 				apache-php.pool-1.1.1 \
@@ -2107,6 +2091,93 @@ function test_custom_configuration ()
 			&> /dev/null
 		end
 
+		describe "PHP date.timezone"
+			it "Sets to 'Europe/London'."
+				__terminate_container \
+					apache-php.pool-1.1.1 \
+				&> /dev/null
+
+				docker run \
+					--detach \
+					--name apache-php.pool-1.1.1 \
+					--publish ${DOCKER_PORT_MAP_TCP_80}:80 \
+					--env PHP_OPTIONS_DATE_TIMEZONE="Europe/London" \
+					jdeathe/centos-ssh-apache-php-fcgi:latest \
+				&> /dev/null
+
+				if ! __is_container_ready \
+					apache-php.pool-1.1.1 \
+					${STARTUP_TIME} \
+					"/usr/sbin/httpd(\.worker|\.event)? " \
+					"[[ 000 != \$(curl -sI -o /dev/null -w %{http_code} localhost/) ]]"
+				then
+					exit 1
+				fi
+
+				php_date_timezone="$(
+					docker exec \
+						apache-php.pool-1.1.1 \
+						php \
+							-r \
+							"printf('%s', ini_get('date.timezone'));"
+				)"
+
+				assert equal \
+					"${php_date_timezone}" \
+					"Europe/London"
+			end
+		end
+
+		describe "PHP session.name"
+			__terminate_container \
+				apache-php.pool-1.1.1 \
+			&> /dev/null
+
+			docker run \
+				--detach \
+				--name apache-php.pool-1.1.1 \
+				--publish ${DOCKER_PORT_MAP_TCP_80}:80 \
+				--env PHP_OPTIONS_SESSION_NAME="app-session" \
+				jdeathe/centos-ssh-apache-php:latest \
+			&> /dev/null
+
+			if ! __is_container_ready \
+				apache-php.pool-1.1.1 \
+				${STARTUP_TIME} \
+				"/usr/sbin/httpd(\.worker|\.event)? " \
+				"[[ 000 != \$(curl -sI -o /dev/null -w %{http_code} localhost/) ]]"
+			then
+				exit 1
+			fi
+
+			container_port_80="$(
+				__get_container_port \
+					apache-php.pool-1.1.1 \
+					80/tcp
+			)"
+
+			it "Sets to app-session."
+				curl_session_name="$(
+					curl -s \
+						--header 'Host: localhost.localdomain' \
+						http://127.0.0.1:${container_port_80}/_phpinfo.php \
+						| grep 'session.name' \
+						| sed -E \
+							-e 's~^.*(session.name)~\1~' \
+							-e 's~</t(r|d)>~~g' \
+							-e 's~<td[^>]*>~ ~g'
+				)"
+
+				assert equal \
+					"${curl_session_name}" \
+					"session.name app-session app-session"
+			end
+
+			__terminate_container \
+				apache-php.pool-1.1.1 \
+			&> /dev/null
+		end
+
 		describe "PHP memcached session store"
 			__terminate_container \
 				apache-php.pool-1.1.1 \