From 1c64404494e1fbcd9d7915af0670b5b900b44e69 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 5 Jan 2015 13:00:57 -0700 Subject: [PATCH] Run update.sh --- centos/README.md | 9 ++++++--- memcached/README.md | 8 -------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/centos/README.md b/centos/README.md index 20e2e681a..3593c0c62 100644 --- a/centos/README.md +++ b/centos/README.md @@ -1,8 +1,11 @@ # Supported tags and respective `Dockerfile` links -- [`latest`, `centos7` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/3bb7881b87349a1e8ce79302163baab3879837fc/docker/Dockerfile) -- [`centos6` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/92c2e02e88c2a3faff13d199ce61d7342456ae50/docker/Dockerfile) -- [`centos5` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/6e198b3ad7a20b8b4fab2720b7ca0b8019acc593/docker/Dockerfile) +- [`latest`, `centos7`, `7` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/c7bfde2d0e3ed621ecfbf02aae7b50d4c912b0f1/docker/Dockerfile) +- [`centos6`, `6` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/684a5ab43827c8316810e5d2abe6ce60e2d68e6e/docker/Dockerfile) +- [`centos5`, `5` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/b0178df16b85ccebaa1bcdbb0aa447f67a2df632/docker/Dockerfile) +- [`centos7.0.1406`, `7.0.1406` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/30aa31e885e3378203d40e50cfd146b160b589dc/docker/Dockerfile) +- [`centos6.6`, `6.6` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/72a13cc9b85c6c500531d5f1e1dd86b8308a1cda/docker/Dockerfile) +- [`centos5.11`, `5.11` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/e0f32850b2893baaa25efa9d98585f4c92aa83fb/docker/Dockerfile) For more information about this image and its history, please see the [relevant manifest file diff --git a/memcached/README.md b/memcached/README.md index c8e9e1903..aad3635c0 100644 --- a/memcached/README.md +++ b/memcached/README.md @@ -38,14 +38,6 @@ variables generated by the link as well as through DNS as `memcache` from For infomation on configuring your memcached server, see the extensive [wiki](https://code.google.com/p/memcached/wiki/NewStart). -# Known Issues - -As of 1.4.21, memcached does not handle `SIGTERM`, so a standard `docker stop` -will not stop it gracefully, but will resort to `SIGKILL` after the 10 second -timeout. Use `docker kill -s INT` to do a clean stop of the memcached -container. There is [a PR](https://github.com/memcached/memcached/pull/88) to -change this behavior upstream. - # License View [license