Merge pull request #260 from jdeathe/issue/249

CLOSES #249: Replaces memcached with redis session store.

Author: jdeathe

CHANGELOG.md

@@ -13,6 +13,7 @@ Summary of release changes.
 - Updates healthcheck failure messages to remove EOL character that is rendered in status response.
 - Updates wrapper script; only emit "waiting on" info message if bootstrap hasn't completed.
 - Updates ordering of Tags and respective Dockerfile links in README.md for readability.
+- Updates session test cases; replace PHP memcached session store with redis.
 - Adds improved test workflow; added `test-setup` target to Makefile.
 - Adds Makefile target `logsdef` to handle deferred logs output within a target chain.
 - Adds `/docs` directory for supplementary documentation and simplify README.

test/shpec/operation_shpec.sh

@@ -10,7 +10,7 @@ DOCKER_PORT_MAP_TCP_8443="${DOCKER_PORT_MAP_TCP_8443:-NULL}"
 
 function __destroy ()
 {
-	local -r session_store_name="memcached.pool-1.1.1"
+	local -r session_store_name="redis.1"
 	local -r session_store_network="bridge_internal_1"
 
 	# Destroy the session store container
@@ -85,10 +85,10 @@ function __is_container_ready ()
 
 function __setup ()
 {
-	local -r session_store_alias="memcached_1"
-	local -r session_store_name="memcached.pool-1.1.1"
+	local -r session_store_alias="redis_1"
+	local -r session_store_name="redis.1"
 	local -r session_store_network="bridge_internal_1"
-	local -r session_store_release="1.3.1"
+	local -r session_store_release="1.2.1"
 
 	if [[ -z $(docker network ls -q -f name="${session_store_network}") ]]; then
 		docker network create \
@@ -107,7 +107,7 @@ function __setup ()
 		--name ${session_store_name} \
 		--network ${session_store_network} \
 		--network-alias ${session_store_alias} \
-		jdeathe/centos-ssh-memcached:${session_store_release} \
+		jdeathe/centos-ssh-redis:${session_store_release} \
 	&> /dev/null
 
 	# Generate a self-signed certificate
@@ -667,7 +667,7 @@ ${other_required_apache_modules}
 
 function test_custom_configuration ()
 {
-	local -r session_store_alias="memcached_1"
+	local -r session_store_alias="redis_1"
 	local -r session_store_network="bridge_internal_1"
 
 	local apache_access_log_entry=""
@@ -2247,7 +2247,7 @@ function test_custom_configuration ()
 			&> /dev/null
 		end
 
-		describe "PHP memcached session store"
+		describe "PHP redis session store"
 			__terminate_container \
 				apache-php.1 \
 			&> /dev/null
@@ -2256,8 +2256,8 @@ function test_custom_configuration ()
 				--detach \
 				--name apache-php.1 \
 				--publish ${DOCKER_PORT_MAP_TCP_80}:80 \
-				--env PHP_OPTIONS_SESSION_SAVE_HANDLER="memcached" \
-				--env PHP_OPTIONS_SESSION_SAVE_PATH="${session_store_alias}:11211" \
+				--env PHP_OPTIONS_SESSION_SAVE_HANDLER="redis" \
+				--env PHP_OPTIONS_SESSION_SAVE_PATH="${session_store_alias}:6379" \
 				jdeathe/centos-ssh-apache-php:latest \
 			&> /dev/null
 
@@ -2289,7 +2289,7 @@ function test_custom_configuration ()
 				session_start();
 				\$_SESSION['integer'] = 123;
 				\$_SESSION['float'] = 12345.67890;
-				\$_SESSION['string'] = '@memcached:#\$£';
+				\$_SESSION['string'] = '@ABCabc:#\$£';
 				session_write_close();
 				var_dump(\$_SESSION);
 			EOT
@@ -2389,7 +2389,7 @@ function test_custom_configuration ()
   ["float"]=>
   float(12345.6789)
   ["string"]=>
-  string(15) "@memcached:#$£"
+  string(12) "@ABCabc:#$£"
 }'
 				end
 			end