Adds CentOS-7 version.

Author: jdeathe

CHANGELOG.md

@@ -1,11 +1,11 @@
 # Change Log
 
-## centos-6
+## centos-7
 
-Summary of release changes for Version 1.
+Summary of release changes for Version 2.
 
-CentOS-6 6.10 x86_64 - Redis 3.2.
+CentOS-7 7.5.1804 x86_64 - Redis 4.0.
 
-### 1.0.0 - Unreleased
+### 2.0.0 - Unreleased
 
 - Initial release.

Dockerfile

@@ -1,16 +1,16 @@
 # =============================================================================
 # jdeathe/centos-ssh-redis
 #
-# CentOS-6, Redis 3.2.
+# CentOS-6, Redis 4.0.
 # =============================================================================
-FROM jdeathe/centos-ssh:1.9.0
+FROM jdeathe/centos-ssh:2.4.0
 
 RUN yum -y install \
 			--setopt=tsflags=nodocs \
 			--disableplugin=fastestmirror \
-		redis32u-3.2.12-1.ius.centos6 \
+		redis40u-4.0.11-1.ius.centos7  \
 	&& yum versionlock add \
-		redis32u* \
+		redis40u* \
 	&& yum clean all
 
 # -----------------------------------------------------------------------------
@@ -58,12 +58,14 @@ ENV REDIS_AUTOSTART_REDIS_BOOTSTRAP="true" \
 	REDIS_MAXMEMORY_POLICY="allkeys-lru" \
 	REDIS_MAXMEMORY_SAMPLES="5" \
 	REDIS_OPTIONS="" \
-	REDIS_TCP_BACKLOG="1024"
+	REDIS_TCP_BACKLOG="1024" \
+	SSH_AUTOSTART_SSHD=false \
+	SSH_AUTOSTART_SSHD_BOOTSTRAP=false
 
 # -----------------------------------------------------------------------------
 # Set image metadata
 # -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="1.0.0"
+ARG RELEASE_VERSION="2.0.0"
 LABEL \
 	maintainer="James Deathe <james.deathe@gmail.com>" \
 	install="docker run \
@@ -90,7 +92,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-6 6.10 x86_64 - Redis 3.2."
+	org.deathe.description="CentOS-7 7.5.1804 x86_64 - Redis 4.0."
 
 HEALTHCHECK \
 	--interval=0.5s \

LICENSE

@@ -1,5 +1,5 @@
-Copyright (c) 2016 James Deathe (jdeathe)
-https://github.com/jdeathe/centos-ssh-memcached
+Copyright (c) 2018 James Deathe (jdeathe)
+https://github.com/jdeathe/centos-ssh-redis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README-short.txt

@@ -1 +1 @@
-CentOS-6 6.10 x86_64 - Redis.
+CentOS-7 7.5.1804 x86_64 - Redis.

README.md

@@ -39,7 +39,8 @@ Run up a container named `redis.pool-1.1.1` from the docker image `jdeathe/cento
 $ docker run -d \
   --name redis.pool-1.1.1 \
   -p 6379:6379/tcp \
-  jdeathe/centos-ssh-redis:1.0.0
+  --sysctl "net.core.somaxconn=1024" \
+  jdeathe/centos-ssh-redis:2.0.0
 ```
 
 Now you can verify it is initialised and running successfully by inspecting the container's logs.
@@ -70,7 +71,10 @@ $ docker run \
   --env "REDIS_MAXMEMORY_SAMPLES=10" \
   --env "REDIS_OPTIONS=--loglevel verbose" \
   --env "REDIS_TCP_BACKLOG=2048" \
-  jdeathe/centos-ssh-redis:1.0.0 \
+  --sysctl "net.core.somaxconn=2048" \
+  --sysctl "net.ipv4.ip_local_port_range=1024 65535" \
+  --sysctl "net.ipv4.route.flush=1" \
+  jdeathe/centos-ssh-redis:2.0.0
 ```
 
 #### Environment Variables

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|((1|centos-6-1)\.[0-9]+\.[0-9]+))$
-DOCKER_IMAGE_RELEASE_TAG_PATTERN := ^(1|centos-6-1)\.[0-9]+\.[0-9]+$
+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]+$
 
 # -----------------------------------------------------------------------------
 # Variables

src/etc/systemd/system/centos-ssh-redis@.service

@@ -52,7 +52,7 @@ Environment="DOCKER_USER=jdeathe"
 Environment="DOCKER_CONTAINER_OPTS="
 Environment="DOCKER_IMAGE_PACKAGE_PATH=/var/opt/scmi/packages"
 Environment="DOCKER_IMAGE_NAME=centos-ssh-redis"
-Environment="DOCKER_IMAGE_TAG=1.0.0"
+Environment="DOCKER_IMAGE_TAG=2.0.0"
 Environment="DOCKER_PORT_MAP_TCP_6379=6379"
 Environment="DOCKER_PORT_MAP_UDP_6379=NULL"
 Environment="REDIS_AUTOSTART_REDIS_BOOTSTRAP=true"

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|((1|centos-6-1)\.[0-9]+\.[0-9]+))$'
-readonly DOCKER_IMAGE_RELEASE_TAG_PATTERN='^(1|centos-6-1)\.[0-9]+\.[0-9]+$'
+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]+$'
 
 # -----------------------------------------------------------------------------
 # Variables
@@ -56,6 +56,6 @@ REDIS_AUTOSTART_REDIS_BOOTSTRAP="${REDIS_AUTOSTART_REDIS_BOOTSTRAP:-true}"
 REDIS_AUTOSTART_REDIS_WRAPPER="${REDIS_AUTOSTART_REDIS_WRAPPER:-true}"
 REDIS_MAXMEMORY="${REDIS_MAXMEMORY:-64mb}"
 REDIS_MAXMEMORY_POLICY="${REDIS_MAXMEMORY_POLICY:-allkeys-lru}"
-REDIS_MAXMEMORY_SAMPLES="${REDIS_MAXMEMORY_SAMPLES:-10}"
+REDIS_MAXMEMORY_SAMPLES="${REDIS_MAXMEMORY_SAMPLES:-5}"
 REDIS_OPTIONS="${REDIS_OPTIONS:-}"
 REDIS_TCP_BACKLOG="${REDIS_TCP_BACKLOG:-1024}"

src/usr/sbin/redis-server-bootstrap

@@ -53,6 +53,9 @@ set_wrapper_execute_user \
 	"${WRAPPER}" \
 	"${USER}"
 
+# Force a longer execution time to allow output in logs
+sleep 0.05
+
 TIMER_TOTAL="$(
 	echo - | awk "\
 	{ T1=\"${TIMER_START}\" } \