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

Release changes for 2.2.0

Author: jdeathe

.env.example

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

.gitignore

@@ -1 +1,2 @@
+.env
 dist

CHANGELOG.md

@@ -6,6 +6,28 @@ Summary of release changes for Version 2.
 
 CentOS-7 7.5.1804 x86_64 - Memcached 1.4.
 
+### 2.2.0 - 2019-02-12
+
+- Updates source image to [2.5.0](https://github.com/jdeathe/centos-ssh/releases/tag/2.5.0).
+- Updates and restructures Dockerfile.
+- Updates default HEALTHCHECK interval to 1 second from 0.5.
+- Updates container naming conventions and readability of `Makefile`.
+- Fixes issue with unexpected published port in run templates when `DOCKER_PORT_MAP_TCP_11211` is set to an empty string or 0.
+- Adds placeholder replacement of `RELEASE_VERSION` docker argument to systemd service unit template.
+- Adds error messages to healthcheck script and includes supervisord check.
+- Adds consideration for event lag into test cases for unhealthy health_status events.
+- Adds port incrementation to Makefile's run template for container names with an instance suffix.
+- Adds improved memcached-wrapper script including optional Details output.
+- Adds validation on `MEMCACHED_CACHESIZE` and `MEMCACHED_MAXCONN` - fails back to default if not a positive non-zero integer.
+- Adds docker-compose configuration example.
+- Adds improved logging output.
+- Removes use of `/etc/services-config` paths.
+- Removes X-Fleet section from etcd register template unit-file.
+- Removes the unused group element from the default container name.
+- Removes the node element from the default container name.
+- Removes unused environment variables from Makefile and scmi configuration.
+- Removes container log file `/var/log/memcached.log`.
+
 ### 2.1.1 - 2018-11-16
 
 - Fixes typo in test; using `--format` instead of `--filter`.

Dockerfile

@@ -1,10 +1,10 @@
-# =============================================================================
-# jdeathe/centos-ssh-memcached
-#
-# CentOS-7, Memcached 1.4.
-# =============================================================================
-FROM jdeathe/centos-ssh:2.4.1
+FROM jdeathe/centos-ssh:2.5.0
 
+ARG RELEASE_VERSION="2.2.0"
+
+# ------------------------------------------------------------------------------
+# Base install of required packages
+# ------------------------------------------------------------------------------
 RUN rpm --rebuilddb \
 	&& yum -y install \
 			--setopt=tsflags=nodocs \
@@ -17,42 +17,43 @@ RUN rpm --rebuilddb \
 	&& rm -rf /var/cache/yum/* \
 	&& yum clean all
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Copy files into place
-# -----------------------------------------------------------------------------
-ADD src/usr/bin \
-	/usr/bin/
-ADD src/usr/sbin \
-	/usr/sbin/
+# ------------------------------------------------------------------------------
+ADD src/etc \
+	/etc/
 ADD src/opt/scmi \
 	/opt/scmi/
-ADD src/etc/services-config/supervisor/supervisord.d \
-	/etc/services-config/supervisor/supervisord.d/
-ADD src/etc/systemd/system \
-	/etc/systemd/system/
+ADD src/usr \
+	/usr/
 
-RUN ln -sf \
-		/etc/services-config/supervisor/supervisord.d/memcached-wrapper.conf \
+# ------------------------------------------------------------------------------
+# Provisioning
+# - Set permissions
+# ------------------------------------------------------------------------------
+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 \
 	&& chmod 700 \
 		/usr/{bin/healthcheck,sbin/memcached-wrapper}
 
 EXPOSE 11211
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Set default environment variables
-# -----------------------------------------------------------------------------
-ENV MEMCACHED_AUTOSTART_MEMCACHED_WRAPPER=true \
+# ------------------------------------------------------------------------------
+ENV MEMCACHED_AUTOSTART_MEMCACHED_WRAPPER="true" \
 	MEMCACHED_CACHESIZE="64" \
 	MEMCACHED_MAXCONN="1024" \
 	MEMCACHED_OPTIONS="-U 0" \
-	SSH_AUTOSTART_SSHD=false \
-	SSH_AUTOSTART_SSHD_BOOTSTRAP=false
+	SSH_AUTOSTART_SSHD="false" \
+	SSH_AUTOSTART_SSHD_BOOTSTRAP="false"
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Set image metadata
-# -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="2.1.1"
+# ------------------------------------------------------------------------------
 LABEL \
 	maintainer="James Deathe <james.deathe@gmail.com>" \
 	install="docker run \
@@ -82,7 +83,7 @@ jdeathe/centos-ssh-memcached:${RELEASE_VERSION} \
 	org.deathe.description="CentOS-7 7.5.1804 x86_64 - Memcached 1.4."
 
 HEALTHCHECK \
-	--interval=0.5s \
+	--interval=1s \
 	--timeout=1s \
 	--retries=4 \
 	CMD ["/usr/bin/healthcheck"]