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

Release changes for 1.1.2

.dockerignore

@@ -0,0 +1,10 @@
+.git
+.gitignore
+dist
+test
+LICENSE
+README-short.txt
+*.md
+!README.md
+**/*.mk
+**/Makefile

CHANGELOG.md

@@ -6,6 +6,11 @@ Summary of release changes for Version 1.
 
 CentOS-6 6.9 x86_64 - Memcached 1.4.
 
+### 1.1.2 - 2018-01-13
+
+- Updates source image to [1.8.3 tag](https://github.com/jdeathe/centos-ssh/releases/tag/1.8.3).
+- Adds a `.dockerignore` file.
+
 ### 1.1.1 - 2017-09-15
 
 - Updates source image to [1.8.2 tag](https://github.com/jdeathe/centos-ssh/releases/tag/1.8.2).

Dockerfile

@@ -3,7 +3,7 @@
 #
 # CentOS-6, Memcached 1.4.
 # =============================================================================
-FROM jdeathe/centos-ssh:1.8.2
+FROM jdeathe/centos-ssh:1.8.3
 
 RUN rpm --rebuilddb \
 	&& yum -y install \
@@ -52,7 +52,7 @@ ENV MEMCACHED_AUTOSTART_MEMCACHED_WRAPPER=true \
 # -----------------------------------------------------------------------------
 # Set image metadata
 # -----------------------------------------------------------------------------
-ARG RELEASE_VERSION="1.1.1"
+ARG RELEASE_VERSION="1.1.2"
 LABEL \
 	maintainer="James Deathe <james.deathe@gmail.com>" \
 	install="docker run \

README.md

@@ -5,11 +5,11 @@ Docker Image including CentOS-6 6.9 x86_64 and Memcached 1.4.
 
 ## Overview & links
 
-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.1` or `1.1.1` for the [1.1.1](https://github.com/jdeathe/centos-ssh-memcached/tree/1.1.1) 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.2` or `1.1.2` for the [1.1.2](https://github.com/jdeathe/centos-ssh-memcached/tree/1.1.2) release tag.
 
 ### Tags and respective `Dockerfile` links
 
-- `centos-6`, `centos-6-1.1.1`, `1.1.1` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-memcached/blob/centos-6/Dockerfile)
+- `centos-6`, `centos-6-1.1.2`, `1.1.2` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-memcached/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).
 
@@ -29,26 +29,26 @@ For cases where access to docker exec is not possible the preferred method is to
 
 ## Quick Example
 
-Run up a container named `memcached.pool-1.1.1` from the docker image `jdeathe/centos-ssh-memcached` on port 11211 of your docker host.
+Run up a container named `memcached.pool-1.1.2` from the docker image `jdeathe/centos-ssh-memcached` on port 11211 of your docker host.
 
 ```
 $ docker run -d \
-  --name memcached.pool-1.1.1 \
+  --name memcached.pool-1.1.2 \
   -p 11211:11211/tcp \
   jdeathe/centos-ssh-memcached:centos-6
 ```
 
 Now you can verify it is initialised and running successfully by inspecting the container's logs.
 
 ```
-$ docker logs memcached.pool-1.1.1
+$ docker logs memcached.pool-1.1.2
 ```
 
 To verify the Memcached service status:
 
 ```
 $ docker exec -it \
-  memcached.pool-1.1.1 \
+  memcached.pool-1.1.2 \
   memcached-tool localhost stats
 ```
 
@@ -63,12 +63,12 @@ In the following example the memcached service is bound to port 11211 of the doc
 #### Using environment variables
 
 ```
-$ docker stop memcached.pool-1.1.1 && \
-  docker rm memcached.pool-1.1.1
+$ docker stop memcached.pool-1.1.2 && \
+  docker rm memcached.pool-1.1.2
 $ docker run \
   --detach \
   --tty \
-  --name memcached.pool-1.1.1 \
+  --name memcached.pool-1.1.2 \
   --publish 11211:11211/tcp \
   --env "MEMCACHED_CACHESIZE=32" \
   jdeathe/centos-ssh-memcached:centos-6

src/etc/systemd/system/centos-ssh-memcached@.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-memcached"
-Environment="DOCKER_IMAGE_TAG=1.1.1"
+Environment="DOCKER_IMAGE_TAG=1.1.2"
 Environment="DOCKER_PORT_MAP_TCP_11211=11211"
 Environment="DOCKER_PORT_MAP_UDP_11211=NULL"
 Environment="MEMCACHED_AUTOSTART_MEMCACHED_WRAPPER=true"