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

Release changes for 1.3.0

Author: jdeathe

.env.example

@@ -1,9 +1,8 @@
 APACHE_SSL_CERTIFICATE=/run/secrets/haproxy_ssl_certificate
-
 HAPROXY_SSL_CERTIFICATE=/run/secrets/haproxy_ssl_certificate
 HAPROXY_CONFIG=/etc/haproxy/haproxy-http.cfg
 HAPROXY_HOST_NAMES=www.app.local app.local localhost.localdomain
-
+SYSTEM_TIMEZONE=UTC
 VARNISH_MAX_THREADS=2000
 VARNISH_MIN_THREADS=100
 VARNISH_OPTIONS=

CHANGELOG.md

@@ -1,10 +1,36 @@
 # Change Log
 
-## centos-6
-
-Summary of release changes for Version 1.
-
-CentOS-6 6.10 x86_64 - HAProxy 1.5 / HATop 0.7.
+## 1 - centos-6
+
+Summary of release changes.
+
+### 1.3.0 - 2019-08-20
+
+- 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 supervisord configuration to send error log output to stderr.
+- Updates haproxy-bootstrap supervisord configuration file/priority to `20-haproxy-bootstrap.conf`/`20`.
+- Updates resyslogd-wrapper supervisord configuration file/priority to `50-rsyslogd-wrapper.conf`/`50`.
+- Updates haproxy-wrapper supervisord configuration file/priority to `90-haproxy-wrapper.conf`/`90`.
+- Updates docker-compose example with redis session store replacing memcached for the apache-php service.
+- Updates wrapper scripts timer to use UTC date timestamps.
+- Updates default timeout values.
+- Updates proxy (varnish) configuration examples to use uri balance algorithm.
+- Updates proxy (varnish) configuration examples to use both backends (removes backup).
+- Fixes docker host connection status check in Makefile.
+- Fixes docker-compose examples; volume mount errors on CentOS host.
+- Adds `inspect`, `reload` and `top` Makefile targets.
+- Adds improved `clean` Makefile target; includes exited containers and dangling images.
+- Adds `SYSTEM_TIMEZONE` handling to Makefile, scmi, systemd unit and docker-compose templates.
+- Adds system time zone validation to healthcheck.
+- Adds lock/state file to wrapper scripts.
+- Adds maintenance feature controlled via acl file `/etc/haproxy/maint-blacklist.acl`.
+- Adds maintenance whitelist via acl file `/etc/haproxy/maint-whitelist.acl`.
+- Removes support for long image tags (i.e. centos-6-1.x.x).
+- Removes `dontlog-normal` from all configuration defaults and add to listeners.
 
 ### 1.2.0 - 2019-05-30
 

Dockerfile

@@ -1,7 +1,7 @@
-FROM jdeathe/centos-ssh:1.10.1
+FROM jdeathe/centos-ssh:1.11.0
 
 ARG HATOP_VERSION="0.7.7"
-ARG RELEASE_VERSION="1.2.0"
+ARG RELEASE_VERSION="1.3.0"
 
 # ------------------------------------------------------------------------------
 # Base install of required packages
@@ -79,7 +79,7 @@ RUN { printf -- \
 	&& chmod 600 \
 		/etc/haproxy/{{haproxy,haproxy-{http,http-proxy,tcp}}.cfg,{400,403,408,500,502,503,504}.html.http} \
 	&& chmod 600 \
-		/etc/supervisord.d/{haproxy-bootstrap,{haproxy,rsyslogd}-wrapper}.conf \
+		/etc/supervisord.d/{20-haproxy-bootstrap,{50-rsyslogd,90-haproxy}-wrapper}.conf \
 	&& chmod 700 \
 		/usr/{bin/healthcheck,sbin/{haproxy-bootstrap,{haproxy,rsyslogd}-wrapper}}
 
@@ -88,12 +88,12 @@ EXPOSE 80 443
 # ------------------------------------------------------------------------------
 # Set default environment variables
 # ------------------------------------------------------------------------------
-ENV HAPROXY_SSL_CERTIFICATE="" \
+ENV \
+	ENABLE_SSHD_WRAPPER="false" \
+	ENABLE_SSHD_BOOTSTRAP="false" \
 	HAPROXY_CONFIG="/etc/haproxy/haproxy.cfg" \
 	HAPROXY_HOST_NAMES="localhost.localdomain" \
-	SSH_AUTOSTART_SSHD="false" \
-	SSH_AUTOSTART_SSHD_BOOTSTRAP="false" \
-	SSH_AUTOSTART_SUPERVISOR_STDOUT="false"
+	HAPROXY_SSL_CERTIFICATE=""
 
 # ------------------------------------------------------------------------------
 # Set image metadata
@@ -124,7 +124,7 @@ jdeathe/centos-ssh-haproxy:${RELEASE_VERSION} \
 	org.deathe.license="MIT" \
 	org.deathe.vendor="jdeathe" \
 	org.deathe.url="https://github.com/jdeathe/centos-ssh-haproxy" \
-	org.deathe.description="CentOS-6 6.10 x86_64 - HAProxy 1.5 / HATop 0.7."
+	org.deathe.description="HAProxy 1.5 / HATop 0.7 - CentOS-6 6.10 x86_64."
 
 HEALTHCHECK \
 	--interval=1s \