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 #7 from jdeathe/centos-6-develop
Browse files Browse the repository at this point in the history
Release changes for 1.0.1
  • Loading branch information
jdeathe authored May 22, 2017
2 parents 4740d20 + 962a49f commit 06d1b41
Show file tree
Hide file tree
Showing 13 changed files with 789 additions and 227 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Change Log

## centos-6

Summary of release changes for Version 1.

CentOS-6 6.8 x86_64 - Memcached 1.4.

### 1.0.1 - 2017-05-22

- Adds source from [jdeathe/centos-ssh:1.7.6](https://github.com/jdeathe/centos-ssh/releases/tag/1.7.6)
- Updates memcached package to `memcached-1.4.4-5.el6`.
- Adds a change log (`CHANGELOG.md`).
- Adds support for semantic version numbered tags.
- Adds minor code style changes to the Makefile for readability.
- Adds support for running `shpec` functional tests with `make test`.
- Adds correct spelling of Memcached in log file path: `/var/log/memcached.log`.
- Replaces deprecated Dockerfile `MAINTAINER` with a `LABEL`.

### 1.0.0 - 2016-11-23

- Initial release based on Memcached version 1.4.
23 changes: 12 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
#
# CentOS-6, Memcached 1.4.
# =============================================================================
FROM jdeathe/centos-ssh:centos-6-1.7.3

MAINTAINER James Deathe <james.deathe@gmail.com>
FROM jdeathe/centos-ssh:1.7.6

RUN rpm --rebuilddb \
&& yum --setopt=tsflags=nodocs -y install \
memcached-1.4.4-3.el6 \
&& yum -y install \
--setopt=tsflags=nodocs \
--disableplugin=fastestmirror \
memcached-1.4.4-5.el6 \
&& yum versionlock add \
memcached* \
&& rm -rf /var/cache/yum/* \
Expand Down Expand Up @@ -47,29 +47,30 @@ ENV MEMCACHED_CACHESIZE="64" \
# -----------------------------------------------------------------------------
# Set image metadata
# -----------------------------------------------------------------------------
ARG RELEASE_VERSION="1.0.0"
ARG RELEASE_VERSION="1.0.1"
LABEL \
maintainer="James Deathe <james.deathe@gmail.com>" \
install="docker run \
--rm \
--privileged \
--volume /:/media/root \
jdeathe/centos-ssh-memcached:centos-6-${RELEASE_VERSION} \
jdeathe/centos-ssh-memcached:${RELEASE_VERSION} \
/usr/sbin/scmi install \
--chroot=/media/root \
--name=\${NAME} \
--tag=centos-6-${RELEASE_VERSION}" \
--tag=${RELEASE_VERSION}" \
uninstall="docker run \
--rm \
--privileged \
--volume /:/media/root \
jdeathe/centos-ssh-memcached:centos-6-${RELEASE_VERSION} \
jdeathe/centos-ssh-memcached:${RELEASE_VERSION} \
/usr/sbin/scmi uninstall \
--chroot=/media/root \
--name=\${NAME} \
--tag=centos-6-${RELEASE_VERSION}" \
--tag=${RELEASE_VERSION}" \
org.deathe.name="centos-ssh-memcached" \
org.deathe.version="${RELEASE_VERSION}" \
org.deathe.release="jdeathe/centos-ssh-memcached:centos-6-${RELEASE_VERSION}" \
org.deathe.release="jdeathe/centos-ssh-memcached:${RELEASE_VERSION}" \
org.deathe.license="MIT" \
org.deathe.vendor="jdeathe" \
org.deathe.url="https://github.com/jdeathe/centos-ssh-memcached" \
Expand Down
Loading

0 comments on commit 06d1b41

Please sign in to comment.