Merge pull request #18 from jdeathe/issue/9

CLOSES #9: Updates source image to 2.5.0.

Author: jdeathe

CHANGELOG.md

@@ -6,6 +6,21 @@ Summary of release changes for Version 2.
 
 CentOS-7 7.5.1804 x86_64 - Redis 4.0.
 
+### 2.1.0 - Unreleased
+
+- 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_6379` or `DOCKER_PORT_MAP_UDP_6379` is set to an empty string or 0.
+- Adds placeholder replacement of `RELEASE_VERSION` docker argument to systemd service unit template.
+- 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.
+- 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.
+
 ### 2.0.1 - 2018-11-19
 
 - Updates source image to [2.4.1](https://github.com/jdeathe/centos-ssh/releases/tag/2.4.1).

Dockerfile

@@ -1,10 +1,10 @@
-# =============================================================================
-# jdeathe/centos-ssh-redis
-#
-# CentOS-7, Redis 4.0.
-# =============================================================================
-FROM jdeathe/centos-ssh:2.4.1
+FROM jdeathe/centos-ssh:2.5.0
 
+ARG RELEASE_VERSION="2.0.1"
+
+# ------------------------------------------------------------------------------
+# Base install of required packages
+# ------------------------------------------------------------------------------
 RUN yum -y install \
 			--setopt=tsflags=nodocs \
 			--disableplugin=fastestmirror \
@@ -13,46 +13,47 @@ RUN yum -y install \
 		redis40u* \
 	&& 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/redis-server-bootstrap.conf \
-		/etc/supervisord.d/redis-server-bootstrap.conf \
-	&& ln -sf \
-		/etc/services-config/supervisor/supervisord.d/redis-server-wrapper.conf \
-		/etc/supervisord.d/redis-server-wrapper.conf \
-	&& chmod 700 \
-		/usr/{bin/healthcheck,sbin/redis-server-{bootstrap,wrapper}} \
-	&& chmod 750 \
-		/usr/sbin/redis-server-wrapper \
-	&& chgrp redis \
-		/usr/sbin/redis-server-wrapper \
-	&& sed -i -r \
+# ------------------------------------------------------------------------------
+# Provisioning
+# - Insert placeholders into redis configuration file
+# - Replace placeholders with values in systemd service unit template
+# - Set permissions
+# ------------------------------------------------------------------------------
+RUN sed -i -r \
 		-e "s~^(logfile ).+$~\1\"\"~" \
 		-e "s~^(bind ).+$~\10.0.0.0~" \
 		-e "s~^(# *)?(maxmemory ).+$~\2{{REDIS_MAXMEMORY}}~" \
 		-e "s~^(# *)?(maxmemory-policy ).+$~\2{{REDIS_MAXMEMORY_POLICY}}~" \
 		-e "s~^(# *)?(maxmemory-samples ).+$~\2{{REDIS_MAXMEMORY_SAMPLES}}~" \
 		-e "s~^(tcp-backlog ).*$~\1{{REDIS_TCP_BACKLOG}}~" \
-		/etc/redis.conf
+		/etc/redis.conf \
+	&& sed -i \
+		-e "s~{{RELEASE_VERSION}}~${RELEASE_VERSION}~g" \
+		/etc/systemd/system/centos-ssh-redis@.service \
+	&& chmod 644 \
+		/etc/supervisord.d/redis-server-{bootstrap,wrapper}.conf \
+	&& chmod 700 \
+		/usr/{bin/healthcheck,sbin/redis-server-{bootstrap,wrapper}} \
+	&& chmod 750 \
+		/usr/sbin/redis-server-wrapper \
+	&& chgrp redis \
+		/usr/sbin/redis-server-wrapper
 
 EXPOSE 6379
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Set default environment variables
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 ENV REDIS_AUTOSTART_REDIS_BOOTSTRAP="true" \
 	REDIS_AUTOSTART_REDIS_WRAPPER="true" \
 	REDIS_MAXMEMORY="64mb" \
@@ -63,10 +64,9 @@ ENV REDIS_AUTOSTART_REDIS_BOOTSTRAP="true" \
 	SSH_AUTOSTART_SSHD="false" \
 	SSH_AUTOSTART_SSHD_BOOTSTRAP="false"
 
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 # Set image metadata
-# -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="2.0.1"
+# ------------------------------------------------------------------------------
 LABEL \
 	maintainer="James Deathe <james.deathe@gmail.com>" \
 	install="docker run \
@@ -96,7 +96,7 @@ jdeathe/centos-ssh-redis:${RELEASE_VERSION} \
 	org.deathe.description="CentOS-7 7.5.1804 x86_64 - Redis 4.0."
 
 HEALTHCHECK \
-	--interval=0.5s \
+	--interval=1s \
 	--timeout=1s \
 	--retries=4 \
 	CMD ["/usr/bin/healthcheck"]