From 9b3c8626171ea5a7bdd89dea204897f86f26e6b3 Mon Sep 17 00:00:00 2001 From: James Deathe Date: Fri, 16 Nov 2018 19:06:10 +0000 Subject: [PATCH] Release changes for 1.2.1/2.1.1. --- CHANGELOG.md | 2 +- Dockerfile | 2 +- README.md | 10 +++++----- src/etc/systemd/system/centos-ssh-memcached@.service | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07c1f59..ebef5b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Summary of release changes for Version 2. CentOS-7 7.5.1804 x86_64 - Memcached 1.4. -### 2.1.1 - Unreleased +### 2.1.1 - 2018-11-16 - Fixes typo in test; using `--format` instead of `--filter`. - Adds required `--sysctl` settings to docker run templates. diff --git a/Dockerfile b/Dockerfile index 5ace0f3..b49b4ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,7 @@ ENV MEMCACHED_AUTOSTART_MEMCACHED_WRAPPER=true \ # ----------------------------------------------------------------------------- # Set image metadata # ----------------------------------------------------------------------------- -ARG RELEASE_VERSION="2.1.0" +ARG RELEASE_VERSION="2.1.1" LABEL \ maintainer="James Deathe " \ install="docker run \ diff --git a/README.md b/README.md index 55f94b5..e655810 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,12 @@ Docker Image including: ## 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.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. +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.1` OR `1.2.1` for the [1.2.1](https://github.com/jdeathe/centos-ssh-memcached/tree/1.2.1) release tag and `centos-7-2.2.1` OR `2.2.1` for the [2.2.1](https://github.com/jdeathe/centos-ssh/tree/2.2.1) release tag. ### Tags and respective `Dockerfile` links -- `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) +- `centos-7`,`centos-7-2.2.1`,`2.2.1` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-memcached/blob/centos-7/Dockerfile) +- `centos-6`,`centos-6-1.2.1`,`1.2.1` [(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). @@ -40,7 +40,7 @@ $ docker run -d \ --name memcached.pool-1.1.1 \ -p 11211:11211/tcp \ --sysctl "net.core.somaxconn=1024" \ - jdeathe/centos-ssh-memcached:2.1.0 + jdeathe/centos-ssh-memcached:2.2.1 ``` Now you can verify it is initialised and running successfully by inspecting the container's logs. @@ -79,7 +79,7 @@ $ docker run \ --sysctl "net.ipv4.ip_local_port_range=1024 65535" \ --sysctl "net.ipv4.route.flush=1" \ --env "MEMCACHED_CACHESIZE=32" \ - jdeathe/centos-ssh-memcached:2.1.0 + jdeathe/centos-ssh-memcached:2.2.1 ``` #### Environment Variables diff --git a/src/etc/systemd/system/centos-ssh-memcached@.service b/src/etc/systemd/system/centos-ssh-memcached@.service index 7016ecc..9def04d 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.1.0" +Environment="DOCKER_IMAGE_TAG=2.1.1" Environment="DOCKER_PORT_MAP_TCP_11211=11211" Environment="DOCKER_PORT_MAP_UDP_11211=NULL" Environment="MEMCACHED_AUTOSTART_MEMCACHED_WRAPPER=true"