Merge pull request #119 from jdeathe/issue/102

CLOSES #102: Updates source image to 2.6.0.

Author: jdeathe

.env.example

@@ -1,3 +1,4 @@
 MEMCACHED_CACHESIZE=64
 MEMCACHED_MAXCONN=1024
-MEMCACHED_OPTIONS=-U 0
+MEMCACHED_OPTIONS=-U 0
+SYSTEM_TIMEZONE=UTC

CHANGELOG.md

@@ -6,12 +6,24 @@ Summary of release changes.
 
 ### 2.3.0 - Unreleased
 
+- Deprecates `MEMCACHED_AUTOSTART_MEMCACHED_WRAPPER`, replaced with `ENABLE_MEMCACHED_WRAPPER`.
+- Updates source image to [2.6.0](https://github.com/jdeathe/centos-ssh/releases/tag/2.6.0).
 - Updates CHANGELOG.md to simplify maintenance.
 - Updates README.md to simplify contents and improve readability.
 - Updates README-short.txt to apply to all image variants.
 - Updates Dockerfile `org.deathe.description` metadata LABEL for consistency.
+- Updates `memcached-wrapper` configuration to send error log output to stderr.
+- Updates `memcached-wrapper` timer to use UTC date timestamps.
+- Updates wrapper supervisord configuration file/priority to `50-memcached-wrapper.conf`/`50`.
 - Fixes binary paths in systemd unit files; missing changes from last release.
+- Fixes docker host connection status check in Makefile.
 - Adds missing instruction step to docker-compose example configuration file.
+- Adds `inspect`, `reload` and `top` Makefile targets.
+- Adds improved `clean` Makefile target; includes exited containers and dangling images.
+- Adds lock/state file to wrapper script.
+- Adds `SYSTEM_TIMEZONE` handling to Makefile, scmi, systemd unit and docker-compose templates.
+- Adds system time zone validation to healthcheck.
+- Removes support for long image tags (i.e. centos-7-2.x.x).
 
 ### 2.2.1 - 2019-03-20
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM jdeathe/centos-ssh:2.5.1
+FROM jdeathe/centos-ssh:2.6.0
 
 ARG RELEASE_VERSION="2.2.1"
 
@@ -31,7 +31,7 @@ RUN sed -i \
 		-e "s~{{RELEASE_VERSION}}~${RELEASE_VERSION}~g" \
 		/etc/systemd/system/centos-ssh-memcached@.service \
 	&& chmod 644 \
-		/etc/supervisord.d/memcached-wrapper.conf \
+		/etc/supervisord.d/50-memcached-wrapper.conf \
 	&& chmod 700 \
 		/usr/{bin/healthcheck,sbin/memcached-wrapper}
 
@@ -40,13 +40,14 @@ EXPOSE 11211
 # ------------------------------------------------------------------------------
 # Set default environment variables
 # ------------------------------------------------------------------------------
-ENV MEMCACHED_AUTOSTART_MEMCACHED_WRAPPER="true" \
+ENV \
+	ENABLE_MEMCACHED_WRAPPER="true" \
+	ENABLE_SSHD_BOOTSTRAP="false" \
+	ENABLE_SSHD_WRAPPER="false" \
+	ENABLE_SUPERVISOR_STDOUT="false" \
 	MEMCACHED_CACHESIZE="64" \
 	MEMCACHED_MAXCONN="1024" \
-	MEMCACHED_OPTIONS="-U 0" \
-	SSH_AUTOSTART_SSHD="false" \
-	SSH_AUTOSTART_SSHD_BOOTSTRAP="false" \
-	SSH_AUTOSTART_SUPERVISOR_STDOUT="false"
+	MEMCACHED_OPTIONS="-U 0"
 
 # ------------------------------------------------------------------------------
 # Set image metadata