From e84867d6696d98848c1aecb8d775690fe5f5dbc8 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Tue, 7 Apr 2015 15:34:43 -0700 Subject: [PATCH] Run update.sh --- ghost/README.md | 2 +- iojs/README.md | 6 +++--- jenkins/README.md | 2 +- mysql/README.md | 12 ++++++------ php/README.md | 18 +++++++++--------- redis/README.md | 3 ++- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/ghost/README.md b/ghost/README.md index e207b8873..04afdf4bf 100644 --- a/ghost/README.md +++ b/ghost/README.md @@ -1,6 +1,6 @@ # Supported tags and respective `Dockerfile` links -- [`0.5.10`, `0.5`, `0`, `latest` (*Dockerfile*)](https://github.com/docker-library/ghost/blob/d07b3e679d043aa359037c133053858800e6d2c8/Dockerfile) +- [`0.5.10`, `0.5`, `0`, `latest` (*Dockerfile*)](https://github.com/docker-library/ghost/blob/2fb73b3ab955365b2f7b5267536aad87f1cd65df/Dockerfile) For more information about this image and its history, please see the [relevant manifest file (`library/ghost`)](https://github.com/docker-library/official-images/blob/master/library/ghost) in the [`docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images). diff --git a/iojs/README.md b/iojs/README.md index 6913d05d2..100bfacd5 100644 --- a/iojs/README.md +++ b/iojs/README.md @@ -1,8 +1,8 @@ # Supported tags and respective `Dockerfile` links -- [`1.6.3`, `1.6`, `1`, `latest` (*1.6/Dockerfile*)](https://github.com/iojs/docker-iojs/blob/46544faff250cd96545a59e8ca68afc9032ff176/1.6/Dockerfile) -- [`1.6.3-onbuild`, `1.6-onbuild`, `1-onbuild`, `onbuild` (*1.6/onbuild/Dockerfile*)](https://github.com/iojs/docker-iojs/blob/46544faff250cd96545a59e8ca68afc9032ff176/1.6/onbuild/Dockerfile) -- [`1.6.3-slim`, `1.6-slim`, `1-slim`, `slim` (*1.6/slim/Dockerfile*)](https://github.com/iojs/docker-iojs/blob/46544faff250cd96545a59e8ca68afc9032ff176/1.6/slim/Dockerfile) +- [`1.6.4`, `1.6`, `1`, `latest` (*1.6/Dockerfile*)](https://github.com/iojs/docker-iojs/blob/9c1a577a0c177e4863eb873917169e3a394fbec8/1.6/Dockerfile) +- [`1.6.4-onbuild`, `1.6-onbuild`, `1-onbuild`, `onbuild` (*1.6/onbuild/Dockerfile*)](https://github.com/iojs/docker-iojs/blob/b6550716eb111e4e5b497757adf5ea55f5a0d29d/1.6/onbuild/Dockerfile) +- [`1.6.4-slim`, `1.6-slim`, `1-slim`, `slim` (*1.6/slim/Dockerfile*)](https://github.com/iojs/docker-iojs/blob/9c1a577a0c177e4863eb873917169e3a394fbec8/1.6/slim/Dockerfile) For more information about this image and its history, please see the [relevant manifest file (`library/iojs`)](https://github.com/docker-library/official-images/blob/master/library/iojs) in the [`docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images). diff --git a/jenkins/README.md b/jenkins/README.md index 5335782bd..593f0f1d8 100644 --- a/jenkins/README.md +++ b/jenkins/README.md @@ -1,6 +1,6 @@ # Supported tags and respective `Dockerfile` links -- [`latest`, `1.596.1` (*Dockerfile*)](https://github.com/cloudbees/jenkins-ci.org-docker/blob/1bdf7cabcc49663dd174c470c2f2c08b4c3dcccb/Dockerfile) +- [`latest`, `1.596.2` (*Dockerfile*)](https://github.com/cloudbees/jenkins-ci.org-docker/blob/66dc63923438e70eaebd68da41bc7b9ea35ce2aa/Dockerfile) For more information about this image and its history, please see the [relevant manifest file (`library/jenkins`)](https://github.com/docker-library/official-images/blob/master/library/jenkins) in the [`docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images). diff --git a/mysql/README.md b/mysql/README.md index a8b550275..92fbf8d1d 100644 --- a/mysql/README.md +++ b/mysql/README.md @@ -1,8 +1,8 @@ # Supported tags and respective `Dockerfile` links -- [`5.5.42`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/mysql/blob/8ed790ab199eeef0f36ef0547ae28e5654cbef0d/5.5/Dockerfile) -- [`5.6.23`, `5.6`, `5`, `latest` (*5.6/Dockerfile*)](https://github.com/docker-library/mysql/blob/8ed790ab199eeef0f36ef0547ae28e5654cbef0d/5.6/Dockerfile) -- [`5.7.6-m16`, `5.7.6`, `5.7` (*5.7/Dockerfile*)](https://github.com/docker-library/mysql/blob/e0d58135e8c54a918037cfe9ea3077a3a088e0de/5.7/Dockerfile) +- [`5.5.43`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/mysql/blob/1f430aeee538aec3b51554ca9fc66955231b3563/5.5/Dockerfile) +- [`5.6.24`, `5.6`, `5`, `latest` (*5.6/Dockerfile*)](https://github.com/docker-library/mysql/blob/1f430aeee538aec3b51554ca9fc66955231b3563/5.6/Dockerfile) +- [`5.7.6-m16`, `5.7.6`, `5.7` (*5.7/Dockerfile*)](https://github.com/docker-library/mysql/blob/95a8d25a230dda44709b8942c46c63595b93b73a/5.7/Dockerfile) For more information about this image and its history, please see the [relevant manifest file (`library/mysql`)](https://github.com/docker-library/official-images/blob/master/library/mysql) in the [`docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images). @@ -52,13 +52,13 @@ The MySQL Server log is available through Docker's container log: ## Using a custom MySQL configuration file -The MySQL startup configuration is specified in the file `/etc/mysql/my.cnf`, and that file in turn includes any files found in the `/etc/mysql/conf.d` directory. Settings in files in this directory will augment and/or override settings in `/etc/mysql/my.cnf`. If you want to use a customized MySQL configuration, you can create your alternative configuration file in a directory on the host machine and then mount that directory location as `/etc/mysql/conf.d` inside the `mysql` container. +The MySQL startup configuration is specified in the file `/etc/mysql/my.cnf`, and that file in turn includes any files found in the `/etc/mysql/conf.d` directory that end with `.cnf`. Settings in files in this directory will augment and/or override settings in `/etc/mysql/my.cnf`. If you want to use a customized MySQL configuration, you can create your alternative configuration file in a directory on the host machine and then mount that directory location as `/etc/mysql/conf.d` inside the `mysql` container. -If `/my/custom/config-file` is the path and name of your custom configuration file, you can start your `mysql` container like this (note that only the directory path of the custom config file is used in this command): +If `/my/custom/config-file.cnf` is the path and name of your custom configuration file, you can start your `mysql` container like this (note that only the directory path of the custom config file is used in this command): docker run --name some-mysql -v /my/custom:/etc/mysql/conf.d -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:tag -This will start a new container `some-mysql` where the MySQL instance uses the combined startup settings from `/etc/mysql/my.cnf` and `/etc/mysql/conf.d/config-file`, with settings from the latter taking precedence. +This will start a new container `some-mysql` where the MySQL instance uses the combined startup settings from `/etc/mysql/my.cnf` and `/etc/mysql/conf.d/config-file.cnf`, with settings from the latter taking precedence. Note that users on host systems with SELinux enabled may see issues with this. The current workaround is to assign the relevant SELinux policy type to your new config file so that the container will be allowed to mount it: diff --git a/php/README.md b/php/README.md index 2948c2c54..616bd4e02 100644 --- a/php/README.md +++ b/php/README.md @@ -1,14 +1,14 @@ # Supported tags and respective `Dockerfile` links -- [`5.4.39-cli`, `5.4-cli`, `5.4.39`, `5.4` (*5.4/Dockerfile*)](https://github.com/docker-library/php/blob/c909cc49a563356927300e12501fd2f86b404b4d/5.4/Dockerfile) -- [`5.4.39-apache`, `5.4-apache` (*5.4/apache/Dockerfile*)](https://github.com/docker-library/php/blob/c909cc49a563356927300e12501fd2f86b404b4d/5.4/apache/Dockerfile) -- [`5.4.39-fpm`, `5.4-fpm` (*5.4/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/0d49708c9983607adc23ed09f778caa54b7312f8/5.4/fpm/Dockerfile) -- [`5.5.23-cli`, `5.5-cli`, `5.5.23`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/php/blob/c909cc49a563356927300e12501fd2f86b404b4d/5.5/Dockerfile) -- [`5.5.23-apache`, `5.5-apache` (*5.5/apache/Dockerfile*)](https://github.com/docker-library/php/blob/c909cc49a563356927300e12501fd2f86b404b4d/5.5/apache/Dockerfile) -- [`5.5.23-fpm`, `5.5-fpm` (*5.5/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/0d49708c9983607adc23ed09f778caa54b7312f8/5.5/fpm/Dockerfile) -- [`5.6.7-cli`, `5.6-cli`, `5-cli`, `cli`, `5.6.7`, `5.6`, `5`, `latest` (*5.6/Dockerfile*)](https://github.com/docker-library/php/blob/c909cc49a563356927300e12501fd2f86b404b4d/5.6/Dockerfile) -- [`5.6.7-apache`, `5.6-apache`, `5-apache`, `apache` (*5.6/apache/Dockerfile*)](https://github.com/docker-library/php/blob/c909cc49a563356927300e12501fd2f86b404b4d/5.6/apache/Dockerfile) -- [`5.6.7-fpm`, `5.6-fpm`, `5-fpm`, `fpm` (*5.6/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/0d49708c9983607adc23ed09f778caa54b7312f8/5.6/fpm/Dockerfile) +- [`5.4.39-cli`, `5.4-cli`, `5.4.39`, `5.4` (*5.4/Dockerfile*)](https://github.com/docker-library/php/blob/08bf31dfd492f02a2696c9a30eb85326b1570abd/5.4/Dockerfile) +- [`5.4.39-apache`, `5.4-apache` (*5.4/apache/Dockerfile*)](https://github.com/docker-library/php/blob/08bf31dfd492f02a2696c9a30eb85326b1570abd/5.4/apache/Dockerfile) +- [`5.4.39-fpm`, `5.4-fpm` (*5.4/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/08bf31dfd492f02a2696c9a30eb85326b1570abd/5.4/fpm/Dockerfile) +- [`5.5.23-cli`, `5.5-cli`, `5.5.23`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/php/blob/08bf31dfd492f02a2696c9a30eb85326b1570abd/5.5/Dockerfile) +- [`5.5.23-apache`, `5.5-apache` (*5.5/apache/Dockerfile*)](https://github.com/docker-library/php/blob/08bf31dfd492f02a2696c9a30eb85326b1570abd/5.5/apache/Dockerfile) +- [`5.5.23-fpm`, `5.5-fpm` (*5.5/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/08bf31dfd492f02a2696c9a30eb85326b1570abd/5.5/fpm/Dockerfile) +- [`5.6.7-cli`, `5.6-cli`, `5-cli`, `cli`, `5.6.7`, `5.6`, `5`, `latest` (*5.6/Dockerfile*)](https://github.com/docker-library/php/blob/08bf31dfd492f02a2696c9a30eb85326b1570abd/5.6/Dockerfile) +- [`5.6.7-apache`, `5.6-apache`, `5-apache`, `apache` (*5.6/apache/Dockerfile*)](https://github.com/docker-library/php/blob/08bf31dfd492f02a2696c9a30eb85326b1570abd/5.6/apache/Dockerfile) +- [`5.6.7-fpm`, `5.6-fpm`, `5-fpm`, `fpm` (*5.6/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/08bf31dfd492f02a2696c9a30eb85326b1570abd/5.6/fpm/Dockerfile) For more information about this image and its history, please see the [relevant manifest file (`library/php`)](https://github.com/docker-library/official-images/blob/master/library/php) in the [`docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images). diff --git a/redis/README.md b/redis/README.md index acff61704..f4fa00f28 100644 --- a/redis/README.md +++ b/redis/README.md @@ -1,7 +1,8 @@ # Supported tags and respective `Dockerfile` links - [`2.6.17`, `2.6` (*2.6/Dockerfile*)](https://github.com/docker-library/redis/blob/5a480f7c9f05822c31204a7197d209ef9db1a32c/2.6/Dockerfile) -- [`2.8.19`, `2.8`, `2`, `latest` (*2.8/Dockerfile*)](https://github.com/docker-library/redis/blob/5a480f7c9f05822c31204a7197d209ef9db1a32c/2.8/Dockerfile) +- [`2.8.19`, `2.8`, `2` (*2.8/Dockerfile*)](https://github.com/docker-library/redis/blob/5a480f7c9f05822c31204a7197d209ef9db1a32c/2.8/Dockerfile) +- [`3.0.0`, `3.0`, `3`, `latest` (*3.0/Dockerfile*)](https://github.com/docker-library/redis/blob/5a2cfe30d3ddb6c1786d603b746fe7e7aa8823ae/3.0/Dockerfile) For more information about this image and its history, please see the [relevant manifest file (`library/redis`)](https://github.com/docker-library/official-images/blob/master/library/redis) in the [`docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images).