Merge pull request #58 from jdeathe/issue/55

CLOSES #55: Updates image source to 1.11.0.

Author: jdeathe

.env.example

@@ -3,3 +3,4 @@ REDIS_MAXMEMORY_POLICY=allkeys-lru
 REDIS_MAXMEMORY_SAMPLES=5
 REDIS_OPTIONS=
 REDIS_TCP_BACKLOG=1024
+SYSTEM_TIMEZONE=UTC

CHANGELOG.md

@@ -1,10 +1,31 @@
 # Change Log
 
-## centos-6
+## 1 - centos-6
 
-Summary of release changes for Version 1.
+Summary of release changes.
 
-CentOS-6 6.10 x86_64 - EPEL Redis 3.2.
+### 1.2.0 - Unreleased
+
+- Updates source image to [1.11.0](https://github.com/jdeathe/centos-ssh/releases/tag/1.11.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 bootstrap and wrapper supervisord configuration to send error log output to stderr.
+- Updates bootstrap timer to use UTC date timestamps.
+- Updates bootstrap supervisord configuration file/priority to `20-redis-bootstrap.conf`/`20`.
+- Updates wrapper supervisord configuration file/priority to `50-redis-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-6-1.x.x).
+- Removes `REDIS_AUTOSTART_REDIS_BOOTSTRAP`, replaced with `ENABLE_REDIS_BOOTSTRAP`.
+- Removes `REDIS_AUTOSTART_REDIS_WRAPPER`, replaced with `ENABLE_REDIS_WRAPPER`.
 
 ### 1.1.1 - 2019-03-21
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM jdeathe/centos-ssh:1.10.1
+FROM jdeathe/centos-ssh:1.11.0
 
 ARG RELEASE_VERSION="1.1.1"
 
@@ -34,7 +34,7 @@ RUN sed -i -r \
 		-e "s~{{RELEASE_VERSION}}~${RELEASE_VERSION}~g" \
 		/etc/systemd/system/centos-ssh-redis@.service \
 	&& chmod 644 \
-		/etc/supervisord.d/redis-server-{bootstrap,wrapper}.conf \
+		/etc/supervisord.d/{20-redis-server-bootstrap,50-redis-server-wrapper}.conf \
 	&& chmod 700 \
 		/usr/{bin/healthcheck,sbin/redis-server-{bootstrap,wrapper}} \
 	&& chmod 750 \
@@ -47,16 +47,17 @@ EXPOSE 6379
 # ------------------------------------------------------------------------------
 # Set default environment variables
 # ------------------------------------------------------------------------------
-ENV REDIS_AUTOSTART_REDIS_BOOTSTRAP="true" \
-	REDIS_AUTOSTART_REDIS_WRAPPER="true" \
+ENV \
+	ENABLE_REDIS_BOOTSTRAP="true" \
+	ENABLE_REDIS_WRAPPER="true" \
+	ENABLE_SSHD_BOOTSTRAP="false" \
+	ENABLE_SSHD_WRAPPER="false" \
+	ENABLE_SUPERVISOR_STDOUT="false" \
 	REDIS_MAXMEMORY="64mb" \
 	REDIS_MAXMEMORY_POLICY="allkeys-lru" \
 	REDIS_MAXMEMORY_SAMPLES="5" \
 	REDIS_OPTIONS="" \
-	REDIS_TCP_BACKLOG="1024" \
-	SSH_AUTOSTART_SSHD="false" \
-	SSH_AUTOSTART_SSHD_BOOTSTRAP="false" \
-	SSH_AUTOSTART_SUPERVISOR_STDOUT="false"
+	REDIS_TCP_BACKLOG="1024"
 
 # -----------------------------------------------------------------------------
 # Set image metadata
@@ -87,7 +88,7 @@ jdeathe/centos-ssh-redis:${RELEASE_VERSION} \
 	org.deathe.license="MIT" \
 	org.deathe.vendor="jdeathe" \
 	org.deathe.url="https://github.com/jdeathe/centos-ssh-redis" \
-	org.deathe.description="CentOS-6 6.10 x86_64 - EPEL Redis 3.2."
+	org.deathe.description="EPEL Redis 3.2 - CentOS-6 6.10 x86_64."
 
 HEALTHCHECK \
 	--interval=1s \