Merge pull request #61 from jdeathe/centos-6-develop

Release changes for 1.1.0

Author: jdeathe

CHANGELOG.md

@@ -4,7 +4,11 @@
 
 Summary of release changes for Version 1.
 
-CentOS-6 6.9 x86_64 - HAProxy 1.5 / HATop 0.7.
+CentOS-6 6.10 x86_64 - HAProxy 1.5 / HATop 0.7.
+
+### 1.1.0 - 2018-10-04
+
+- Updates source image to [1.9.0](https://github.com/jdeathe/centos-ssh/releases/tag/1.9.0).
 
 ### 1.0.3 - 2018-07-16
 

Dockerfile

@@ -1,7 +1,7 @@
 # =============================================================================
 # jdeathe/centos-ssh-haproxy
 # =============================================================================
-FROM jdeathe/centos-ssh:1.8.4
+FROM jdeathe/centos-ssh:1.9.0
 
 ARG HATOP_VERSION="0.7.7"
 
@@ -150,7 +150,7 @@ ENV HAPROXY_SSL_CERTIFICATE="" \
 # -----------------------------------------------------------------------------
 # Set image metadata
 # -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="1.0.3"
+ARG RELEASE_VERSION="1.1.0"
 LABEL \
 	maintainer="James Deathe <[email protected]>" \
 	install="docker run \
@@ -177,7 +177,7 @@ jdeathe/centos-ssh-haproxy:${RELEASE_VERSION} \
 	org.deathe.license="MIT" \
 	org.deathe.vendor="jdeathe" \
 	org.deathe.url="https://github.com/jdeathe/centos-ssh-haproxy" \
-	org.deathe.description="CentOS-6 6.9 x86_64 - HAProxy 1.5 / HATop 0.7."
+	org.deathe.description="CentOS-6 6.10 x86_64 - HAProxy 1.5 / HATop 0.7."
 
 HEALTHCHECK \
 	--interval=0.5s \

README-short.txt

@@ -1 +1 @@
-CentOS-6 6.9 x86_64 - HAProxy / HATop.
+CentOS-6 6.10 x86_64 - HAProxy / HATop.

README.md

@@ -1,22 +1,22 @@
 Docker Image including:
-- CentOS-6 6.9 x86_64 - HAProxy 1.5 / HATop 0.7.
-- CentOS-7 7.4.1708 x86_64 - HAProxy 1.8 / HATop 0.7.
+- CentOS-6 6.10 x86_64 - HAProxy 1.5 / HATop 0.7.
+- CentOS-7 7.5.1804 x86_64 - HAProxy 1.8 / HATop 0.7.
 
 - http://www.haproxy.org/
 - http://feurix.org/projects/hatop/
 
 ## Overview & links
 
-- `centos-7`, `centos-7-2.0.0`, `2.0.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-7/Dockerfile)
-- `centos-6`, `centos-6-1.0.3`, `1.0.3` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-6/Dockerfile)
+- `centos-7`, `centos-7-2.1.0`, `2.1.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-7/Dockerfile)
+- `centos-6`, `centos-6-1.1.0`, `1.1.0` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-6/Dockerfile)
 
 #### centos-6
 
-The latest CentOS-6 based release can be pulled from the `centos-6` Docker tag. It is recommended to select a specific release tag - the convention is `centos-6-1.0.3`or `1.0.3` for the [1.0.3](https://github.com/jdeathe/centos-ssh-haproxy/tree/1.0.3) release tag.
+The latest CentOS-6 based release can be pulled from the `centos-6` Docker tag. It is recommended to select a specific release tag - the convention is `centos-6-1.1.0`or `1.1.0` for the [1.1.0](https://github.com/jdeathe/centos-ssh-haproxy/tree/1.1.0) release tag.
 
 #### centos-7
 
-The latest CentOS-7 based release can be pulled from the `centos-7` Docker tag. It is recommended to select a specific release tag - the convention is `centos-7-2.0.0`or `2.0.0` for the [2.0.0](https://github.com/jdeathe/centos-ssh-haproxy/tree/2.0.0) release tag.
+The latest CentOS-7 based release can be pulled from the `centos-7` Docker tag. It is recommended to select a specific release tag - the convention is `centos-7-2.1.0`or `2.1.0` for the [2.1.0](https://github.com/jdeathe/centos-ssh-haproxy/tree/2.1.0) release tag.
 
 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).
 
@@ -45,7 +45,7 @@ $ docker run -d -t \
   -p 443:443 \
   --add-host httpd_1:172.17.8.101 \
   --add-host httpd_2:172.17.8.102 \
-  jdeathe/centos-ssh-haproxy:1.0.3
+  jdeathe/centos-ssh-haproxy:1.1.0
 ```
 
 Now you can verify it is initialised and running successfully by inspecting the container's logs.
@@ -82,7 +82,7 @@ $ docker run \
   --env "HAPROXY_HOST_NAMES=www.app.local app.local localhost.localdomain" \
   --add-host httpd_1:172.17.8.101 \
   --add-host httpd_2:172.17.8.102 \
-  jdeathe/centos-ssh-haproxy:1.0.3
+  jdeathe/centos-ssh-haproxy:1.1.0
 ```
 
 Now you can verify it is initialised and running successfully by inspecting the container's logs:

docker-compose-http-proxy.yml

@@ -30,7 +30,7 @@ services:
       VARNISH_MAX_THREADS: "4096"
       VARNISH_MIN_THREADS: "1024"
       VARNISH_VCL_CONF: "${VARNISH_VCL_CONF:-/var/run/secrets/varnish_vcl_default}"
-    image: "jdeathe/centos-ssh-varnish:2.0.0"
+    image: "jdeathe/centos-ssh-varnish:2.1.0"
     networks:
       - "tier2"
       - "tier3"
@@ -55,7 +55,7 @@ services:
       VARNISH_MAX_THREADS: "4096"
       VARNISH_MIN_THREADS: "1024"
       VARNISH_VCL_CONF: "${VARNISH_VCL_CONF:-/var/run/secrets/varnish_vcl_default}"
-    image: "jdeathe/centos-ssh-varnish:2.0.0"
+    image: "jdeathe/centos-ssh-varnish:2.1.0"
     networks:
       - "tier2"
       - "tier3"

docker-compose.yml

@@ -66,7 +66,7 @@ services:
       APACHE_SERVER_NAME: "www.app.local"
       PHP_OPTIONS_SESSION_SAVE_HANDLER: "memcached"
       PHP_OPTIONS_SESSION_SAVE_PATH: "memcached:11211"
-    image: "jdeathe/centos-ssh-apache-php:2.2.6"
+    image: "jdeathe/centos-ssh-apache-php:2.3.0"
     networks:
       - "tier3"
       - "tier4"
@@ -85,7 +85,7 @@ services:
       APACHE_SERVER_NAME: "www.app.local"
       PHP_OPTIONS_SESSION_SAVE_HANDLER: "memcached"
       PHP_OPTIONS_SESSION_SAVE_PATH: "memcached:11211"
-    image: "jdeathe/centos-ssh-apache-php:2.2.6"
+    image: "jdeathe/centos-ssh-apache-php:2.3.0"
     networks:
       - "tier3"
       - "tier4"
@@ -95,7 +95,7 @@ services:
       net.ipv4.ip_local_port_range: "1024 65535"
       net.ipv4.route.flush: "1"
   memcached:
-    image: "jdeathe/centos-ssh-memcached:1.1.3"
+    image: "jdeathe/centos-ssh-memcached:1.2.0"
     environment:
       MEMCACHED_CACHESIZE: "32"
       MEMCACHED_MAXCONN: "2048"

src/etc/systemd/system/[email protected]

@@ -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-haproxy"
-Environment="DOCKER_IMAGE_TAG=1.0.3"
+Environment="DOCKER_IMAGE_TAG=1.1.0"
 Environment="DOCKER_PORT_MAP_TCP_80=8000"
 Environment="DOCKER_PORT_MAP_TCP_443=8500"
 Environment="ULIMIT_MEMLOCK=82000"

test/shpec/operation_shpec.sh

@@ -94,7 +94,7 @@ function __setup ()
 	local -r backend_name_1="apache-php.pool-1.1.1"
 	local -r backend_name_2="apache-php.pool-1.1.2"
 	local -r backend_network="bridge_t1"
-	local -r backend_release="2.2.5"
+	local -r backend_release="2.3.0"
 
 	# Create the bridge network
 	if [[ -z $(docker network ls -q -f name="${backend_network}") ]]; then