diff --git a/CHANGELOG.md b/CHANGELOG.md index bce401c..395d7f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,11 @@ Summary of release changes for Version 2. -CentOS-7 7.4.1708 x86_64 - Memcached 1.4. +CentOS-7 7.5.1804 x86_64 - Memcached 1.4. + +### 2.1.0 - 2018-08-16 + +- Updates source image to [1.9.0](https://github.com/jdeathe/centos-ssh/releases/tag/1.9.0). ### 2.0.0 - 2018-05-12 diff --git a/Dockerfile b/Dockerfile index 7c8440d..c71affd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # # CentOS-7, Memcached 1.4. # ============================================================================= -FROM jdeathe/centos-ssh:2.3.2 +FROM jdeathe/centos-ssh:2.4.0 RUN rpm --rebuilddb \ && yum -y install \ @@ -52,7 +52,7 @@ ENV MEMCACHED_AUTOSTART_MEMCACHED_WRAPPER=true \ # ----------------------------------------------------------------------------- # Set image metadata # ----------------------------------------------------------------------------- -ARG RELEASE_VERSION="2.0.0" +ARG RELEASE_VERSION="2.1.0" LABEL \ maintainer="James Deathe " \ install="docker run \ @@ -79,7 +79,7 @@ jdeathe/centos-ssh-memcached:${RELEASE_VERSION} \ org.deathe.license="MIT" \ org.deathe.vendor="jdeathe" \ org.deathe.url="https://github.com/jdeathe/centos-ssh-memcached" \ - org.deathe.description="CentOS-7 7.4.1708 x86_64 - Memcached 1.4." + org.deathe.description="CentOS-7 7.5.1804 x86_64 - Memcached 1.4." HEALTHCHECK \ --interval=0.5s \ diff --git a/README-short.txt b/README-short.txt index dc24818..144e103 100644 --- a/README-short.txt +++ b/README-short.txt @@ -1 +1 @@ -CentOS-7 7.4.1708 x86_64 - Memcached. \ No newline at end of file +CentOS-7 7.5.1804 x86_64 - Memcached. \ No newline at end of file diff --git a/README.md b/README.md index 503d93d..9048ae3 100644 --- a/README.md +++ b/README.md @@ -3,17 +3,17 @@ centos-ssh-memcached Docker Image including: -- CentOS-6 6.9 x86_64 and Memcached 1.4. -- CentOS-7 7.4.1708 x86_64 and Memcached 1.4. +- CentOS-6 6.10 x86_64 and Memcached 1.4. +- CentOS-7 7.5.1804 x86_64 and Memcached 1.4. ## 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.3` OR `1.1.3` for the [1.1.3](https://github.com/jdeathe/centos-ssh-memcached/tree/1.1.3) release tag and `centos-7-2.0.0` OR `2.0.0` for the [2.0.0](https://github.com/jdeathe/centos-ssh/tree/2.0.0) release tag. +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.2.0` OR `1.2.0` for the [1.2.0](https://github.com/jdeathe/centos-ssh-memcached/tree/1.2.0) release tag and `centos-7-2.1.0` OR `2.1.0` for the [2.1.0](https://github.com/jdeathe/centos-ssh/tree/2.1.0) release tag. ### Tags and respective `Dockerfile` links -- `centos-7`,`centos-7-2.0.0`,`2.0.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-memcached/blob/centos-7/Dockerfile) -- `centos-6`,`centos-6-1.1.3`,`1.1.3` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-memcached/blob/centos-6/Dockerfile) +- `centos-7`,`centos-7-2.1.0`,`2.1.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-memcached/blob/centos-7/Dockerfile) +- `centos-6`,`centos-6-1.2.0`,`1.2.0` [(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). @@ -39,7 +39,7 @@ Run up a container named `memcached.pool-1.1.1` from the docker image `jdeathe/c $ docker run -d \ --name memcached.pool-1.1.1 \ -p 11211:11211/tcp \ - jdeathe/centos-ssh-memcached:centos-7 + jdeathe/centos-ssh-memcached:2.1.0 ``` Now you can verify it is initialised and running successfully by inspecting the container's logs. @@ -75,7 +75,7 @@ $ docker run \ --name memcached.pool-1.1.1 \ --publish 11211:11211/tcp \ --env "MEMCACHED_CACHESIZE=32" \ - jdeathe/centos-ssh-memcached:centos-7 + jdeathe/centos-ssh-memcached:2.1.0 ``` #### Environment Variables diff --git a/src/etc/systemd/system/centos-ssh-memcached@.service b/src/etc/systemd/system/centos-ssh-memcached@.service index 06a04b1..143b57d 100644 --- a/src/etc/systemd/system/centos-ssh-memcached@.service +++ b/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=2.0.0" +Environment="DOCKER_IMAGE_TAG=2.1.0" Environment="DOCKER_PORT_MAP_TCP_11211=11211" Environment="DOCKER_PORT_MAP_UDP_11211=NULL" Environment="MEMCACHED_AUTOSTART_MEMCACHED_WRAPPER=true"