Skip to content
This repository has been archived by the owner on Jul 2, 2024. It is now read-only.

Commit

Permalink
Merge pull request #44 from jdeathe/centos-7-develop
Browse files Browse the repository at this point in the history
Release changes for 2.1.0
  • Loading branch information
jdeathe authored Aug 16, 2018
2 parents b2b15f1 + e278850 commit accd088
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 13 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 <james.deathe@gmail.com>" \
install="docker run \
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion README-short.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CentOS-7 7.4.1708 x86_64 - Memcached.
CentOS-7 7.5.1804 x86_64 - Memcached.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand All @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/etc/systemd/system/centos-ssh-memcached@.service
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit accd088

Please sign in to comment.