Merge pull request #206 from jdeathe/centos-7-develop

Release changes for 2.4.0

.env.example

@@ -1,3 +1,4 @@
+SYSTEM_TIMEZONE=UTC
 VARNISH_MAX_THREADS=1000
 VARNISH_MIN_THREADS=50
 VARNISH_OPTIONS=

CHANGELOG.md

@@ -1,10 +1,33 @@
 # Change Log
 
-## centos-7
+## 2 - centos-7
 
-Summary of release changes for Version 2.
+Summary of release changes.
 
-CentOS-7 7.5.1804 x86_64 - Varnish Cache 6.2.
+### 2.4.0 - 2019-08-17
+
+- 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 supervisord configuration to send error log output to stderr.
+- Updates varnishd supervisord configuration file/priority to `80-varnishd-wrapper.conf`/`80`.
+- Updates varnishncsa supervisord configuration file/priority to `50-varnishncsa-wrapper.conf`/`50`.
+- 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 backend probe window from 5 to 3 to reduce time to register an offline backend.
+- Fixes docker host connection status check in Makefile.
+- Fixes error when restarting/reloading varnishd.
+- 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 VCL to handle `/status` and `/varnish-status` for monitoring the backend and varnish respectively.
+- Removes `VARNISH_AUTOSTART_VARNISHD_WRAPPER`, replaced with `ENABLE_VARNISHD_WRAPPER`.
+- Removes `VARNISH_AUTOSTART_VARNISHNCSA_WRAPPER`, replaced with `ENABLE_VARNISHNCSA_WRAPPER`.
+- Removes support for long image tags (i.e. centos-7-2.x.x).
 
 ### 2.3.0 - 2019-05-06
 

Dockerfile

@@ -1,6 +1,6 @@
-FROM jdeathe/centos-ssh:2.5.1
+FROM jdeathe/centos-ssh:2.6.0
 
-ARG RELEASE_VERSION="2.3.0"
+ARG RELEASE_VERSION="2.4.0"
 
 # ------------------------------------------------------------------------------
 # Base install of required packages
@@ -17,7 +17,7 @@ RUN { printf -- \
 		'1' \
 		'/etc/pki/tls/certs/ca-bundle.crt' \
 		'300'; \
-	} > /etc/yum.repos.d/varnishcache_varnish61.repo \
+	} > /etc/yum.repos.d/varnishcache_varnish62.repo \
 	&& yum -y install \
 		--setopt=tsflags=nodocs \
 		--disableplugin=fastestmirror \
@@ -37,7 +37,6 @@ ADD src /
 # ------------------------------------------------------------------------------
 # Provisioning
 # - Replace placeholders with values in systemd service unit template
-# - Symbolic link varnish access log file to stdout
 # - Create directory for varnishncsa PID file
 # - Set permissions
 # ------------------------------------------------------------------------------
@@ -50,7 +49,7 @@ RUN sed -i \
 		varnishlog:varnish \
 		/var/{lib/misc,lock/subsys,run}/varnish \
 	&& chmod 644 \
-		/etc/varnish/*.vcl \
+		/etc/{supervisord.d/{50-varnishncsa-wrapper,80-varnishd-wrapper}.conf,varnish/docker-default.vcl} \
 	&& chmod 700 \
 		/usr/{bin/healthcheck,sbin/{varnishd,varnishncsa}-wrapper} \
 	&& chmod 750 \
@@ -63,11 +62,11 @@ EXPOSE 80 8443
 # ------------------------------------------------------------------------------
 # Set default environment variables
 # ------------------------------------------------------------------------------
-ENV SSH_AUTOSTART_SSHD="false" \
-	SSH_AUTOSTART_SSHD_BOOTSTRAP="false" \
-	SSH_AUTOSTART_SUPERVISOR_STDOUT="false" \
-	VARNISH_AUTOSTART_VARNISHD_WRAPPER="true" \
-	VARNISH_AUTOSTART_VARNISHNCSA_WRAPPER="false" \
+ENV \
+	ENABLE_SSHD_BOOTSTRAP="false" \
+	ENABLE_SSHD_WRAPPER="false" \
+	ENABLE_VARNISHD_WRAPPER="true" \
+	ENABLE_VARNISHNCSA_WRAPPER="false" \
 	VARNISH_MAX_THREADS="1000" \
 	VARNISH_MIN_THREADS="50" \
 	VARNISH_OPTIONS="" \
@@ -107,7 +106,7 @@ jdeathe/centos-ssh-varnish:${RELEASE_VERSION} \
 	org.deathe.license="MIT" \
 	org.deathe.vendor="jdeathe" \
 	org.deathe.url="https://github.com/jdeathe/centos-ssh-varnish" \
-	org.deathe.description="CentOS-7 7.5.1804 x86_64 - Varnish Cache 6.2."
+	org.deathe.description="Varnish Cache 6.2 - CentOS-7 7.6.1810 x86_64."
 
 HEALTHCHECK \
 	--interval=1s \