Updates for addition of Version 3/4

Author: jdeathe

CHANGELOG.md

@@ -1,47 +1,11 @@
 # Change Log
 
-## centos-7
+## centos-7-redis40u
 
-Summary of release changes for Version 2.
+Summary of release changes for Version 4.
 
-CentOS-7 7.5.1804 x86_64 - Redis 4.0.
+CentOS-7 7.5.1804 x86_64 - IUS Redis 4.0.
 
-### 2.1.1 - 2019-03-21
-
-- **Notice: This will be the last Version 2 release. The Version 3 release will be based on EPEL `redis` packages (i.e Redis 3.2). Version 4 will be based on IUS `redis40u` packages (i.e Redis 4.0).**
-- Updates source image to [2.5.1](https://github.com/jdeathe/centos-ssh/releases/tag/2.5.1).
-- Updates Dockerfile with combined ADD to reduce layer count in final image.
-- Fixes binary paths in systemd unit files for compatibility with both EL and Ubuntu hosts.
-- Adds improvement to pull logic in systemd unit install template.
-- Adds `SSH_AUTOSTART_SUPERVISOR_STDOUT` with a value "false", disabling startup of `supervisor_stdout`.
-- Adds improved `healtchcheck` script.
-- Adds `docker-compose.yml` to `.dockerignore`.
-- Disables disk persistence by default; primary use-case being an LRU cache.
-
-### 2.1.0 - 2019-02-17
-
-- 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.
-- Adds docker-compose configuration example.
-- Adds improved logging output.
-- Adds improved bootstrap / wrapper scripts.
-- 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/redis-server-bootstrap` and `/var/log/redis/redis.log`.
-
-### 2.0.1 - 2018-11-19
-
-- Updates source image to [2.4.1](https://github.com/jdeathe/centos-ssh/releases/tag/2.4.1).
-
-### 2.0.0 - 2018-11-03
+### 4.0.0 - Unreleased
 
 - Initial release.

Dockerfile

@@ -1,6 +1,6 @@
 FROM jdeathe/centos-ssh:2.5.1
 
-ARG RELEASE_VERSION="2.1.1"
+ARG RELEASE_VERSION="4.0.0"
 
 # ------------------------------------------------------------------------------
 # Base install of required packages
@@ -90,7 +90,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-7 7.5.1804 x86_64 - Redis 4.0."
+	org.deathe.description="CentOS-7 7.5.1804 x86_64 - IUS Redis 4.0."
 
 HEALTHCHECK \
 	--interval=1s \

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018 James Deathe (jdeathe)
+Copyright (c) 2019 James Deathe (jdeathe)
 https://github.com/jdeathe/centos-ssh-redis
 
 Permission is hereby granted, free of charge, to any person obtaining

README.md

@@ -3,24 +3,25 @@ centos-ssh-redis
 
 Docker Image including:
 
-- CentOS-6 6.10 x86_64 and Redis 3.2.
-- CentOS-7 7.5.1804 x86_64 and Redis 4.0.
+- CentOS-6 6.10 x86_64 and EPEL Redis 3.2.
+- CentOS-7 7.5.1804 x86_64 and EPEL Redis 3.2.
+- CentOS-7 7.5.1804 x86_64 and IUS Redis 4.0.
 
 ## Overview & links
 
-The latest CentOS-6 / CentOS-7 based releases can be pulled from the `centos-6` / `centos-7` Docker tags respectively. For production use it is recommended to select a specific release tag - the convention is `centos-6-1.1.1` OR `1.1.1` for the [1.1.1](https://github.com/jdeathe/centos-ssh-redis/tree/1.1.1) release tag and `centos-7-2.1.1` OR `2.1.1` for the [2.1.1](https://github.com/jdeathe/centos-ssh-redis/tree/2.1.1) release tag.
-
 ### Tags and respective `Dockerfile` links
 
-- `centos-7`,`centos-7-2.1.1`,`2.1.1` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-redis/blob/centos-7/Dockerfile)
+- `centos-7`,`centos-7-4.0.0`,`4.0.0` [(centos-7-redis40u/Dockerfile)](https://github.com/jdeathe/centos-ssh-redis/blob/centos-7-redis40u/Dockerfile)
+- `centos-7`,`centos-7-3.0.0`,`3.0.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-redis/blob/centos-7/Dockerfile)
 - `centos-6`,`centos-6-1.1.1`,`1.1.1` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-redis/blob/centos-6/Dockerfile)
 
 Included in the build are the [SCL](https://www.softwarecollections.org/), [EPEL](http://fedoraproject.org/wiki/EPEL) and [IUS](https://ius.io) repositories. Installed packages include [OpenSSH](http://www.openssh.com/portable.html) secure shell, [vim-minimal](http://www.vim.org/), are installed along with python-setuptools, [supervisor](http://supervisord.org/) and [supervisor-stdout](https://github.com/coderanger/supervisor-stdout).
 
-Supervisor is used to start the redis-server (and optionally the sshd) daemon when a docker container based on this image is run. To enable simple viewing of stdout for the service's subprocess, supervisor-stdout is included. This allows you to see output from the supervisord controlled subprocesses with `docker logs {docker-container-name}`.
+Supervisor is used to start the redis-server (and optionally the sshd) daemon when a docker container based on this image is run.
 
 If enabling and configuring SSH access, it is by public key authentication and, by default, the [Vagrant](http://www.vagrantup.com/) [insecure private key](https://github.com/mitchellh/vagrant/blob/master/keys/vagrant) is required.
 
+
 ### SSH Alternatives
 
 SSH is not required in order to access a terminal for the running container. The simplest method is to use the docker exec command to run bash (or sh) as follows: 

environment.mk

@@ -6,8 +6,8 @@ DOCKER_IMAGE_NAME := centos-ssh-redis
 SHPEC_ROOT := test/shpec
 
 # Tag validation patterns
-DOCKER_IMAGE_TAG_PATTERN := ^(latest|centos-[6-7]|((1|2|centos-(6-1|7-2))\.[0-9]+\.[0-9]+))$
-DOCKER_IMAGE_RELEASE_TAG_PATTERN := ^(1|2|centos-(6-1|7-2))\.[0-9]+\.[0-9]+$
+DOCKER_IMAGE_TAG_PATTERN := ^(latest|centos-[6-7]|centos-7-redis40u|((1|3|4|centos-(6-1|7-3|7-redis40u-4))\.[0-9]+\.[0-9]+))$
+DOCKER_IMAGE_RELEASE_TAG_PATTERN := ^(1|3|4|centos-(6-1|7-3|7-redis40u-4))\.[0-9]+\.[0-9]+$
 
 # ------------------------------------------------------------------------------
 # Variables

src/opt/scmi/environment.sh

@@ -5,8 +5,8 @@ readonly DOCKER_USER=jdeathe
 readonly DOCKER_IMAGE_NAME=centos-ssh-redis
 
 # Tag validation patterns
-readonly DOCKER_IMAGE_TAG_PATTERN='^(latest|centos-[6-7]|((1|2|centos-(6-1|7-2))\.[0-9]+\.[0-9]+))$'
-readonly DOCKER_IMAGE_RELEASE_TAG_PATTERN='^(1|2|centos-(6-1|7-2))\.[0-9]+\.[0-9]+$'
+readonly DOCKER_IMAGE_TAG_PATTERN='^(latest|centos-[6-7]|centos-7-redis40u|((1|3|4|centos-(6-1|7-3|7-redis40u-4))\.[0-9]+\.[0-9]+))$'
+readonly DOCKER_IMAGE_RELEASE_TAG_PATTERN='^(1|3|4|centos-(6-1|7-3|7-redis40u-4))\.[0-9]+\.[0-9]+$'
 
 # ------------------------------------------------------------------------------
 # Variables