Merge remote branch 'upstream/master'

2016-10-05 12:31:11 +05:30 · 2016-10-05 12:31:11 +05:30 · ad766d6499
parent 88a2d89956 21c1ec5a00
commit ad766d6499
99 changed files with 1261 additions and 350 deletions
--- a/README.md
+++ b/README.md
@ -4,7 +4,10 @@ This repository contains the docs for each of the Docker official images. See [d

 All Markdown files here are run through [tianon's fork of `markdownfmt`](https://github.com/tianon/markdownfmt) (only forked to add some smaller-diff preference and minor DockerHub-compatibility changes), and verified as formatted correctly via Travis-CI.

-[![Build Status](https://travis-ci.org/docker-library/docs.svg?branch=master)](https://travis-ci.org/docker-library/docs)
+-	[Travis CI:  
+	![build status badge](https://travis-ci.org/docker-library/docs.svg?branch=master)](https://travis-ci.org/docker-library/docs)
+-	[Automated `update.sh` and `push.sh`:  
+	![build status badge](https://doi-janky.infosiftr.net/job/docs/job/update/badge/icon)](https://doi-janky.infosiftr.net/job/docs/job/update/)

 # How do I add a new image's docs

@ -103,6 +106,6 @@ This file is an optional override of the default `user-feedback.md` for those re

 # Issues and Contributing

-If you would like to make a new Official Image, be sure to follow the [guidelines](https://docs.docker.com/docker-hub/official_repos/) and optionally talk to officialrepos@docker.com.
+If you would like to make a new Official Image, be sure to follow the [guidelines](https://docs.docker.com/docker-hub/official_repos/).

 Feel free to make a pull request for fixes and improvements to current documentation. For questions or problems on this repo come talk to us via the `#docker-library` IRC channel on [Freenode](https://freenode.net) or open up an issue.
--- a/aerospike/README.md
+++ b/aerospike/README.md
@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links

-	[`3.9.1.1`, `latest` (*Dockerfile*)](https://github.com/aerospike/aerospike-server.docker/blob/955c0a023f0a2cce2b013b4bfbd016cc96435809/Dockerfile)
+-	[`3.9.1-1`, `latest` (*Dockerfile*)](https://github.com/aerospike/aerospike-server.docker/blob/176a3b8cc79eb883052a8fb1cf3802960b82e600/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/aerospike`)](https://github.com/docker-library/official-images/blob/master/library/aerospike). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Faerospike).

--- a/alpine/README.md
+++ b/alpine/README.md
@ -1,10 +1,10 @@
 # Supported tags and respective `Dockerfile` links

-	[`3.1` (*versions/library-3.1/Dockerfile*)](https://github.com/gliderlabs/docker-alpine/blob/8b668207b1387ea6a8a81852488f9019bb4fac1a/versions/library-3.1/Dockerfile)
-	[`3.2` (*versions/library-3.2/Dockerfile*)](https://github.com/gliderlabs/docker-alpine/blob/0530f7c6532e301daedde95992b768ac44a90315/versions/library-3.2/Dockerfile)
-	[`3.3` (*versions/library-3.3/Dockerfile*)](https://github.com/gliderlabs/docker-alpine/blob/4b026bc2d50121c47a6bfd2ceda39461668b6d54/versions/library-3.3/Dockerfile)
-	[`3.4`, `latest` (*versions/library-3.4/Dockerfile*)](https://github.com/gliderlabs/docker-alpine/blob/45ba65c1116aaf668f7ab5f2b3ae2ef4b00738be/versions/library-3.4/Dockerfile)
-	[`edge` (*versions/library-edge/Dockerfile*)](https://github.com/gliderlabs/docker-alpine/blob/30bc683424fd34eb520aa856fea9984382a8f8fc/versions/library-edge/Dockerfile)
+-	[`3.1` (*versions/library-3.1/Dockerfile*)](https://github.com/gliderlabs/docker-alpine/blob/a9a9643b27e2c3ac5c54aa6652a465795719edf9/versions/library-3.1/Dockerfile)
+-	[`3.2` (*versions/library-3.2/Dockerfile*)](https://github.com/gliderlabs/docker-alpine/blob/322a7330bb18e07a71b648033f5b76e122c064d3/versions/library-3.2/Dockerfile)
+-	[`3.3` (*versions/library-3.3/Dockerfile*)](https://github.com/gliderlabs/docker-alpine/blob/3d320a4b32a6b19c31b4b8b36752138e442031c9/versions/library-3.3/Dockerfile)
+-	[`3.4`, `latest` (*versions/library-3.4/Dockerfile*)](https://github.com/gliderlabs/docker-alpine/blob/8f23fc2e995ab8f7f0f5960c6a1ddd12f57efd0c/versions/library-3.4/Dockerfile)
+-	[`edge` (*versions/library-edge/Dockerfile*)](https://github.com/gliderlabs/docker-alpine/blob/626d0f762c17632c260c7be43a953817bf986c86/versions/library-edge/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/alpine`)](https://github.com/docker-library/official-images/blob/master/library/alpine). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Falpine).

--- a/arangodb/README.md
+++ b/arangodb/README.md
@ -4,7 +4,7 @@
 -	[`2.6`, `2.6.10` (*jessie/2.6.10/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/803663b157696616d70e2bb44ce6e256f912e3a6/jessie/2.6.10/Dockerfile)
 -	[`2.7`, `2.7.5` (*jessie/2.7.5/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/dbfcc5f3edb37f622a2acd221b58106547b05fae/jessie/2.7.5/Dockerfile)
 -	[`2.8`, `2.8.11` (*jessie/2.8.11/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/05366cb4c6a6aab8e1ff9ca74c81b09d9a57b5b5/jessie/2.8.11/Dockerfile)
-	[`3.0`, `3.0.5`, `latest` (*jessie/3.0.5/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/a8466f62875774c39b2f0ed55f7edba8ce2f7ebf/jessie/3.0.5/Dockerfile)
+-	[`3.0`, `3.0.10`, `latest` (*jessie/3.0.10/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/b71073b2e36acff7d0660b7f73e659f16facbf99/jessie/3.0.10/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/arangodb`)](https://github.com/docker-library/official-images/blob/master/library/arangodb). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Farangodb).

@ -44,7 +44,7 @@ Furthermore, ArangoDB offers a microservice framework called [Foxx](https://www.
 In order to start an ArangoDB instance run

 ```console
-unix> docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 -d --name arangodb-instance -d arangodb
+unix> docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 -d --name arangodb-instance arangodb
 ```

 Will create and launch the arangodb docker instance as background process. The Identifier of the process is printed. By default ArangoDB listen on port 8529 for request and the image includes `EXPOSE 8529`. If you link an application container it is automatically available in the linked container. See the following examples.
--- a/arangodb/content.md
+++ b/arangodb/content.md
@ -32,7 +32,7 @@ Furthermore, ArangoDB offers a microservice framework called [Foxx](https://www.
 In order to start an ArangoDB instance run

 ```console
-unix> docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 -d --name arangodb-instance -d arangodb
+unix> docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 -d --name arangodb-instance arangodb
 ```

 Will create and launch the arangodb docker instance as background process. The Identifier of the process is printed. By default ArangoDB listen on port 8529 for request and the image includes `EXPOSE 8529`. If you link an application container it is automatically available in the linked container. See the following examples.
--- a/backdrop/README.md
+++ b/backdrop/README.md
@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links

-	[`1.3.4`, `1.3`, `1`, `1.3.4-apache`, `1.3-apache`, `1-apache`, `apache`, `latest` (*1/apache/Dockerfile*)](https://github.com/backdrop-ops/backdrop-docker/blob/ce9edf32f4263d00181cc58a5fb23437316675b3/1/apache/Dockerfile)
-	[`1.3.4-fpm`, `1.3-fpm`, `1-fpm`, `fpm` (*1/fpm/Dockerfile*)](https://github.com/backdrop-ops/backdrop-docker/blob/ce9edf32f4263d00181cc58a5fb23437316675b3/1/fpm/Dockerfile)
+-	[`1.5.0`, `1.5`, `1`, `1.5.0-apache`, `1.5-apache`, `1-apache`, `apache`, `latest` (*1/apache/Dockerfile*)](https://github.com/backdrop-ops/backdrop-docker/blob/204f01a842a77ea6b4f99797b3e7bdc31db05925/1/apache/Dockerfile)
+-	[`1.5.0-fpm`, `1.5-fpm`, `1-fpm`, `fpm` (*1/fpm/Dockerfile*)](https://github.com/backdrop-ops/backdrop-docker/blob/204f01a842a77ea6b4f99797b3e7bdc31db05925/1/fpm/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/backdrop`)](https://github.com/docker-library/official-images/blob/master/library/backdrop). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fbackdrop).

--- a/bonita/README.md
+++ b/bonita/README.md
@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links

 -	[`7.2.4` (*7.2/Dockerfile*)](https://github.com/Bonitasoft-Community/docker_bonita/blob/c8d6cbb007b77a9ce5b22a7e874608962f863e99/7.2/Dockerfile)
-	[`7.3.1`, `latest` (*7.3/Dockerfile*)](https://github.com/Bonitasoft-Community/docker_bonita/blob/115be1c84d7fab9555e4ea9fbfdd638c8686b524/7.3/Dockerfile)
+-	[`7.3.2`, `latest` (*7.3/Dockerfile*)](https://github.com/Bonitasoft-Community/docker_bonita/blob/50a2a367f8538ada69e3e17889896d98ff28ca21/7.3/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/bonita`)](https://github.com/docker-library/official-images/blob/master/library/bonita). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fbonita).

--- a/cassandra/README.md
+++ b/cassandra/README.md
@ -1,9 +1,9 @@
 # Supported tags and respective `Dockerfile` links

-	[`2.1.15`, `2.1` (*2.1/Dockerfile*)](https://github.com/docker-library/cassandra/blob/ef66ec669d3930aea018f74dc58f5bd2ef5df880/2.1/Dockerfile)
-	[`2.2.7`, `2.2`, `2` (*2.2/Dockerfile*)](https://github.com/docker-library/cassandra/blob/ef66ec669d3930aea018f74dc58f5bd2ef5df880/2.2/Dockerfile)
-	[`3.0.8`, `3.0` (*3.0/Dockerfile*)](https://github.com/docker-library/cassandra/blob/ef66ec669d3930aea018f74dc58f5bd2ef5df880/3.0/Dockerfile)
-	[`3.7`, `3`, `latest` (*3.7/Dockerfile*)](https://github.com/docker-library/cassandra/blob/c3c26f2efdb9874dc5b3717662462e8ca0b2d944/3.7/Dockerfile)
+-	[`2.1.15`, `2.1` (*2.1/Dockerfile*)](https://github.com/docker-library/cassandra/blob/ef57ef961003e27469b86178f0b4d184bb64d82e/2.1/Dockerfile)
+-	[`2.2.8`, `2.2`, `2` (*2.2/Dockerfile*)](https://github.com/docker-library/cassandra/blob/ef57ef961003e27469b86178f0b4d184bb64d82e/2.2/Dockerfile)
+-	[`3.0.9`, `3.0` (*3.0/Dockerfile*)](https://github.com/docker-library/cassandra/blob/ef57ef961003e27469b86178f0b4d184bb64d82e/3.0/Dockerfile)
+-	[`3.7`, `3`, `latest` (*3.7/Dockerfile*)](https://github.com/docker-library/cassandra/blob/ef57ef961003e27469b86178f0b4d184bb64d82e/3.7/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/cassandra`)](https://github.com/docker-library/official-images/blob/master/library/cassandra). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fcassandra).

--- a/celery/README.md
+++ b/celery/README.md
@ -1,6 +1,7 @@
 # Supported tags and respective `Dockerfile` links

-	[`3.1.23`, `3.1`, `3`, `latest` (*Dockerfile*)](https://github.com/docker-library/celery/blob/0652407560f353e749cbe001e8bdbb5db86c2291/Dockerfile)
+-	[`4.0.0rc4`, `4.0`, `4` (*4.0/Dockerfile*)](https://github.com/docker-library/celery/blob/8e10b9f6008ca34cd9ef2a74f032531bd44193b4/4.0/Dockerfile)
+-	[`3.1.23`, `3.1`, `3`, `latest` (*3.1/Dockerfile*)](https://github.com/docker-library/celery/blob/2b56f641be3c38c4367fa7501268b43398199922/3.1/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/celery`)](https://github.com/docker-library/official-images/blob/master/library/celery). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fcelery).

--- a/centos/README.md
+++ b/centos/README.md
@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links

-	[`latest`, `centos7`, `7` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/f5b919346432acc728078aa32ffb6dcf84d303a0/docker/Dockerfile)
-	[`centos6`, `6` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/98bda021f98ad46991afcd9f8ca657bce762e631/docker/Dockerfile)
+-	[`latest`, `centos7`, `7` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/6df5e76a6403483f2ce463c11c36d98d7d957886/docker/Dockerfile)
+-	[`centos6`, `6` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/939b4dc62009b1cdc3857f19996b1fd749b047f7/docker/Dockerfile)
 -	[`centos5`, `5` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/4bf8330498e1c10cf365aff31d2a8a5c3254c2cf/docker/Dockerfile)
 -	[`centos7.2.1511`, `7.2.1511` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/a3c59bd4e98a7f9c063d993955c8ec19c5b1ceff/docker/Dockerfile)
 -	[`centos7.1.1503`, `7.1.1503` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/bc561dfdd671d612dbb9f92e7e17dd8009befc44/docker/Dockerfile)
--- a/chronograf/README.md
+++ b/chronograf/README.md
@ -1,6 +1,5 @@
 # Supported tags and respective `Dockerfile` links

-	[`0.12`, `0.12.0` (*0.12/Dockerfile*)](https://github.com/influxdata/chronograf-docker/blob/82b30f8a10b7dde9b13953400288768f109bf749/0.12/Dockerfile)
 -	[`0.13`, `0.13.0`, `latest` (*chronograf/0.13/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/22b661b4c141d237669f94e4740f234b7be43a7b/chronograf/0.13/Dockerfile)
 -	[`1.0.0-rc1` (*chronograf/1.0/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/22b661b4c141d237669f94e4740f234b7be43a7b/chronograf/1.0/Dockerfile)

--- a/clearlinux/README.md
+++ b/clearlinux/README.md
@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links

-	[`latest`, `base` (*Dockerfile*)](https://github.com/clearlinux/docker-brew-clearlinux/blob/0f1e92867c2fcaf0d94f9941444f6f917832f6ff/Dockerfile)
+-	[`latest`, `base` (*Dockerfile*)](https://github.com/clearlinux/docker-brew-clearlinux/blob/de83daab518dd1d86be3cecf442e3d7617e4aa2b/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/clearlinux`)](https://github.com/docker-library/official-images/blob/master/library/clearlinux). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fclearlinux).

--- a/clojure/README.md
+++ b/clojure/README.md
@ -1,9 +1,9 @@
 # Supported tags and respective `Dockerfile` links

-	[`latest`, `lein-2.7.0` (*Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/8cf0e16895dfebd99cc4d93e86d66d4bc03f4ac1/Dockerfile)
-	[`onbuild`, `lein-2.7.0-onbuild` (*onbuild/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/8cf0e16895dfebd99cc4d93e86d66d4bc03f4ac1/onbuild/Dockerfile)
-	[`alpine`, `lein-2.7.0-alpine` (*alpine/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/8cf0e16895dfebd99cc4d93e86d66d4bc03f4ac1/alpine/Dockerfile)
-	[`alpine-onbuild`, `lein-2.7.0-alpine-onbuild` (*alpine-onbuild/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/8cf0e16895dfebd99cc4d93e86d66d4bc03f4ac1/alpine-onbuild/Dockerfile)
+-	[`latest`, `lein-2.7.1` (*Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/c77c13529de02183433da15e8227eba63cc96724/Dockerfile)
+-	[`onbuild`, `lein-2.7.1-onbuild` (*onbuild/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/c77c13529de02183433da15e8227eba63cc96724/onbuild/Dockerfile)
+-	[`alpine`, `lein-2.7.1-alpine` (*alpine/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/c77c13529de02183433da15e8227eba63cc96724/alpine/Dockerfile)
+-	[`alpine-onbuild`, `lein-2.7.1-alpine-onbuild` (*alpine-onbuild/Dockerfile*)](https://github.com/Quantisan/docker-clojure/blob/c77c13529de02183433da15e8227eba63cc96724/alpine-onbuild/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/clojure`)](https://github.com/docker-library/official-images/blob/master/library/clojure). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fclojure).

--- a/consul/README.md
+++ b/consul/README.md
@ -1,6 +1,7 @@
 # Supported tags and respective `Dockerfile` links

-	[`v0.6.4`, `latest` (*0.6/Dockerfile*)](https://github.com/hashicorp/docker-consul/blob/9a59dc1a87adc164b72ac67bc9e4364a3fc4138d/0.6/Dockerfile)
+-	[`latest`, `v0.7.0` (*0.X/Dockerfile*)](https://github.com/hashicorp/docker-consul/blob/470868df3885ad93f45a2c63c648bf119a544fa4/0.X/Dockerfile)
+-	[`v0.6.4` (*0.6/Dockerfile*)](https://github.com/hashicorp/docker-consul/blob/9a59dc1a87adc164b72ac67bc9e4364a3fc4138d/0.6/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/consul`)](https://github.com/docker-library/official-images/blob/master/library/consul). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fconsul).

@ -29,15 +30,15 @@ We don't cover Consul's multi-datacenter capability here, but as long as `--net=

 # Using the Container

-We chose Alpine as a lightweight base with a reasonably small surface area for security concerns, but with enough functionality for development, interactive debugging, and useful health, watch, and exec scripts running under Consul in the container.
+We chose Alpine as a lightweight base with a reasonably small surface area for security concerns, but with enough functionality for development, interactive debugging, and useful health, watch, and exec scripts running under Consul in the container. As of Consul 0.7, the image also includes `curl` since it is so commonly used for health checks.

 Consul always runs under [dumb-init](https://github.com/Yelp/dumb-init), which handles reaping zombie processes and forwards signals on to all processes running in the container. We also use [gosu](https://github.com/tianon/gosu) to run Consul as a non-root "consul" user for better security. These binaries are all built by HashiCorp and signed with our [GPG key](https://www.hashicorp.com/security.html), so you can verify the signed package used to build a given base image.

 Running the Consul container with no arguments will give you a Consul server in [development mode](https://www.consul.io/docs/agent/options.html#_dev). The provided entry point script will also look for Consul subcommands and run `consul` as the correct user and with that subcommand. For example, you can execute `docker run consul members` and it will run the `consul members` command inside the container. The entry point also adds some special configuration options as detailed in the sections below when running the `agent` subcommand. Any other command gets `exec`-ed inside the container under `dumb-init`.

-The container exposes `VOLUME /consul/data`, which is a path were Consul will place its persisted state. This isn't used in any way when running in development mode. For client agents, this stores some information about the cluster and the client's health checks in case the container is restarted. For server agents, this stores the client information plus snapshots and data related to the consensus algorithm and other state like Consul's key/value store and catalog. For servers it is highly desirable to keep this volume's data around when restarting containers to recover from outage scenarios.
+The container exposes `VOLUME /consul/data`, which is a path were Consul will place its persisted state. This isn't used in any way when running in development mode. For client agents, this stores some information about the cluster and the client's health checks in case the container is restarted. For server agents, this stores the client information plus snapshots and data related to the consensus algorithm and other state like Consul's key/value store and catalog. For servers it is highly desirable to keep this volume's data around when restarting containers to recover from outage scenarios. If this is bind mounted then ownership will be changed to the consul user when the container starts.

-The container has a Consul configuration directory set up at `/consul/config` and the agent will load any configuration files placed here by binding a volume or by composing a new image and adding files. Alternatively, configuration can be added by passing the configuration JSON via environment variable `CONSUL_LOCAL_CONFIG`.
+The container has a Consul configuration directory set up at `/consul/config` and the agent will load any configuration files placed here by binding a volume or by composing a new image and adding files. Alternatively, configuration can be added by passing the configuration JSON via environment variable `CONSUL_LOCAL_CONFIG`. If this is bind mounted then ownership will be changed to the consul user when the container starts.

 Since Consul is almost always run with `--net=host` in Docker, some care is required when configuring Consul's IP addresses. Consul has the concept of its cluster address as well as its client address. The cluster address is the address at which other Consul agents may contact a given agent. The client address is the address where other processes on the host contact Consul in order to make HTTP or DNS requests. You will typically need to tell Consul what its cluster address is when starting so that it binds to the correct interface and advertises a workable interface to the rest of the Consul agents. You'll see this in the examples below as the `-bind=<external ip>` argument to Consul.

@ -164,10 +165,12 @@ Once the cluster is bootstrapped and quorum is achieved, you must use care to ke

 ## Exposing Consul's DNS Server on Port 53

-By default, Consul's DNS server is exposed on port 8600. Because this is cumbersome to configure with facilities like `resolv.conf`, you may want to expose DNS on port 53 using port arguments on your run command:
+By default, Consul's DNS server is exposed on port 8600. Because this is cumbersome to configure with facilities like `resolv.conf`, you may want to expose DNS on port 53. Consul 0.7 and later supports this by setting an environment variable that runs `setcap` on the Consul binary, allowing it to bind to privileged ports. Note that not all Docker storage backends support this feature (notably AUFS).
+
+Here's an example:

 ```console
-$ docker run -d --net=host -p 53:8600/tcp -p 53:8600/udp consul
+$ docker run -d --net=host -e 'CONSUL_ALLOW_PRIVILEGED_PORTS=' consul -dns-port=53
 ```

 If you are binding Consul's client interfaces to the host's loopback address, then you should be able to configure your host's `resolv.conf` to route DNS requests to Consul by including "127.0.0.1" as the primary DNS server. This would expose Consul's DNS to all applications running on the host, but due to Docker's built-in DNS server, you can't point to this directly from inside your containers; Docker will issue an error message if you attempt to do this. You must configure Consul to listen on a non-localhost address that is reachable from within other containers.
@ -175,7 +178,7 @@ If you are binding Consul's client interfaces to the host's loopback address, th
 Once you bind Consul's client interfaces to the bridge or other network, you can use the `--dns` option in your *other containers* in order for them to use Consul's DNS server, mapped to port 53. Here's an example:

 ```console
-$ docker run -d --net=host -p 53:8600/tcp -p 53:8600/udp consul agent -bind=<bridge ip>
+$ docker run -d --net=host -e 'CONSUL_ALLOW_PRIVILEGED_PORTS=' consul agent -dns-port=53 -bind=<bridge ip>
 ```

 Now start another container and point it at Consul's DNS, using the bridge address of the host:
--- a/consul/content.md
+++ b/consul/content.md
@ -21,15 +21,15 @@ We don't cover Consul's multi-datacenter capability here, but as long as `--net=

 # Using the Container

-We chose Alpine as a lightweight base with a reasonably small surface area for security concerns, but with enough functionality for development, interactive debugging, and useful health, watch, and exec scripts running under Consul in the container.
+We chose Alpine as a lightweight base with a reasonably small surface area for security concerns, but with enough functionality for development, interactive debugging, and useful health, watch, and exec scripts running under Consul in the container. As of Consul 0.7, the image also includes `curl` since it is so commonly used for health checks.

 Consul always runs under [dumb-init](https://github.com/Yelp/dumb-init), which handles reaping zombie processes and forwards signals on to all processes running in the container. We also use [gosu](https://github.com/tianon/gosu) to run Consul as a non-root "consul" user for better security. These binaries are all built by HashiCorp and signed with our [GPG key](https://www.hashicorp.com/security.html), so you can verify the signed package used to build a given base image.

 Running the Consul container with no arguments will give you a Consul server in [development mode](https://www.consul.io/docs/agent/options.html#_dev). The provided entry point script will also look for Consul subcommands and run `consul` as the correct user and with that subcommand. For example, you can execute `docker run consul members` and it will run the `consul members` command inside the container. The entry point also adds some special configuration options as detailed in the sections below when running the `agent` subcommand. Any other command gets `exec`-ed inside the container under `dumb-init`.

-The container exposes `VOLUME /consul/data`, which is a path were Consul will place its persisted state. This isn't used in any way when running in development mode. For client agents, this stores some information about the cluster and the client's health checks in case the container is restarted. For server agents, this stores the client information plus snapshots and data related to the consensus algorithm and other state like Consul's key/value store and catalog. For servers it is highly desirable to keep this volume's data around when restarting containers to recover from outage scenarios.
+The container exposes `VOLUME /consul/data`, which is a path were Consul will place its persisted state. This isn't used in any way when running in development mode. For client agents, this stores some information about the cluster and the client's health checks in case the container is restarted. For server agents, this stores the client information plus snapshots and data related to the consensus algorithm and other state like Consul's key/value store and catalog. For servers it is highly desirable to keep this volume's data around when restarting containers to recover from outage scenarios. If this is bind mounted then ownership will be changed to the consul user when the container starts.

-The container has a Consul configuration directory set up at `/consul/config` and the agent will load any configuration files placed here by binding a volume or by composing a new image and adding files. Alternatively, configuration can be added by passing the configuration JSON via environment variable `CONSUL_LOCAL_CONFIG`.
+The container has a Consul configuration directory set up at `/consul/config` and the agent will load any configuration files placed here by binding a volume or by composing a new image and adding files. Alternatively, configuration can be added by passing the configuration JSON via environment variable `CONSUL_LOCAL_CONFIG`. If this is bind mounted then ownership will be changed to the consul user when the container starts.

 Since Consul is almost always run with `--net=host` in Docker, some care is required when configuring Consul's IP addresses. Consul has the concept of its cluster address as well as its client address. The cluster address is the address at which other Consul agents may contact a given agent. The client address is the address where other processes on the host contact Consul in order to make HTTP or DNS requests. You will typically need to tell Consul what its cluster address is when starting so that it binds to the correct interface and advertises a workable interface to the rest of the Consul agents. You'll see this in the examples below as the `-bind=<external ip>` argument to Consul.

@ -156,10 +156,12 @@ Once the cluster is bootstrapped and quorum is achieved, you must use care to ke

 ## Exposing Consul's DNS Server on Port 53

-By default, Consul's DNS server is exposed on port 8600. Because this is cumbersome to configure with facilities like `resolv.conf`, you may want to expose DNS on port 53 using port arguments on your run command:
+By default, Consul's DNS server is exposed on port 8600. Because this is cumbersome to configure with facilities like `resolv.conf`, you may want to expose DNS on port 53. Consul 0.7 and later supports this by setting an environment variable that runs `setcap` on the Consul binary, allowing it to bind to privileged ports. Note that not all Docker storage backends support this feature (notably AUFS).
+
+Here's an example:

 ```console
-$ docker run -d --net=host -p 53:8600/tcp -p 53:8600/udp consul
+$ docker run -d --net=host -e 'CONSUL_ALLOW_PRIVILEGED_PORTS=' consul -dns-port=53
 ```

 If you are binding Consul's client interfaces to the host's loopback address, then you should be able to configure your host's `resolv.conf` to route DNS requests to Consul by including "127.0.0.1" as the primary DNS server. This would expose Consul's DNS to all applications running on the host, but due to Docker's built-in DNS server, you can't point to this directly from inside your containers; Docker will issue an error message if you attempt to do this. You must configure Consul to listen on a non-localhost address that is reachable from within other containers.
@ -167,7 +169,7 @@ If you are binding Consul's client interfaces to the host's loopback address, th
 Once you bind Consul's client interfaces to the bridge or other network, you can use the `--dns` option in your *other containers* in order for them to use Consul's DNS server, mapped to port 53. Here's an example:

 ```console
-$ docker run -d --net=host -p 53:8600/tcp -p 53:8600/udp consul agent -bind=<bridge ip>
+$ docker run -d --net=host -e 'CONSUL_ALLOW_PRIVILEGED_PORTS=' consul agent -dns-port=53 -bind=<bridge ip>
 ```

 Now start another container and point it at Consul's DNS, using the bridge address of the host:
--- a/couchbase/README.md
+++ b/couchbase/README.md
@ -1,9 +1,9 @@
 # Supported tags and respective `Dockerfile` links

-	[`latest`, `enterprise`, `4.5.0`, `enterprise-4.5.0` (*enterprise/couchbase-server/4.5.0/Dockerfile*)](https://github.com/couchbase/docker/blob/7d5070a349860e28b49562fd92602bdd5d0b91e3/enterprise/couchbase-server/4.5.0/Dockerfile)
-	[`community`, `community-4.1.0` (*community/couchbase-server/4.1.0/Dockerfile*)](https://github.com/couchbase/docker/blob/7d5070a349860e28b49562fd92602bdd5d0b91e3/community/couchbase-server/4.1.0/Dockerfile)
-	[`3.1.6`, `enterprise-3.1.6` (*enterprise/couchbase-server/3.1.6/Dockerfile*)](https://github.com/couchbase/docker/blob/7d5070a349860e28b49562fd92602bdd5d0b91e3/enterprise/couchbase-server/3.1.6/Dockerfile)
-	[`community-3.1.3` (*community/couchbase-server/3.1.3/Dockerfile*)](https://github.com/couchbase/docker/blob/7d5070a349860e28b49562fd92602bdd5d0b91e3/community/couchbase-server/3.1.3/Dockerfile)
+-	[`latest`, `enterprise`, `4.5.1`, `enterprise-4.5.1` (*enterprise/couchbase-server/4.5.1/Dockerfile*)](https://github.com/couchbase/docker/blob/dee8b669948d80347d49a067b365c54c5038ba87/enterprise/couchbase-server/4.5.1/Dockerfile)
+-	[`community`, `community-4.1.0` (*community/couchbase-server/4.1.0/Dockerfile*)](https://github.com/couchbase/docker/blob/dee8b669948d80347d49a067b365c54c5038ba87/community/couchbase-server/4.1.0/Dockerfile)
+-	[`3.1.6`, `enterprise-3.1.6` (*enterprise/couchbase-server/3.1.6/Dockerfile*)](https://github.com/couchbase/docker/blob/dee8b669948d80347d49a067b365c54c5038ba87/enterprise/couchbase-server/3.1.6/Dockerfile)
+-	[`community-3.1.3` (*community/couchbase-server/3.1.3/Dockerfile*)](https://github.com/couchbase/docker/blob/dee8b669948d80347d49a067b365c54c5038ba87/community/couchbase-server/3.1.3/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/couchbase`)](https://github.com/docker-library/official-images/blob/master/library/couchbase). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fcouchbase).

--- a/crate/README.md
+++ b/crate/README.md
@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links

-	[`latest`, `0.55`, `0.55.4` (*Dockerfile*)](https://github.com/crate/docker-crate/blob/19f24bd044f24e5ad72cf898804eaa90dddd0a70/Dockerfile)
+-	[`latest`, `0.55`, `0.55.5` (*Dockerfile*)](https://github.com/crate/docker-crate/blob/03df8b7b20d4467099eebccc8005046bc5e23c80/Dockerfile)
 -	[`0.52`, `0.52.4` (*Dockerfile*)](https://github.com/crate/docker-crate/blob/cce8f796ba8936250eb380235cde47be494d1e95/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/crate`)](https://github.com/docker-library/official-images/blob/master/library/crate). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fcrate).
--- a/debian/README.md
+++ b/debian/README.md
@ -1,17 +1,17 @@
 # Supported tags and respective `Dockerfile` links

-	[`8.5`, `8`, `jessie`, `latest` (*jessie/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/589b967ff4364528ebd686b002a6ee00f00f4657/jessie/Dockerfile)
-	[`jessie-backports` (*jessie/backports/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/589b967ff4364528ebd686b002a6ee00f00f4657/jessie/backports/Dockerfile)
-	[`oldstable` (*oldstable/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/589b967ff4364528ebd686b002a6ee00f00f4657/oldstable/Dockerfile)
-	[`oldstable-backports` (*oldstable/backports/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/589b967ff4364528ebd686b002a6ee00f00f4657/oldstable/backports/Dockerfile)
-	[`sid` (*sid/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/0262f960f1f11cea2b3b73c4e04f52cb4219f8ea/sid/Dockerfile)
-	[`stable` (*stable/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/589b967ff4364528ebd686b002a6ee00f00f4657/stable/Dockerfile)
-	[`stable-backports` (*stable/backports/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/589b967ff4364528ebd686b002a6ee00f00f4657/stable/backports/Dockerfile)
-	[`stretch` (*stretch/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/0262f960f1f11cea2b3b73c4e04f52cb4219f8ea/stretch/Dockerfile)
-	[`testing` (*testing/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/0262f960f1f11cea2b3b73c4e04f52cb4219f8ea/testing/Dockerfile)
-	[`unstable` (*unstable/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/0262f960f1f11cea2b3b73c4e04f52cb4219f8ea/unstable/Dockerfile)
-	[`7.11`, `7`, `wheezy` (*wheezy/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/589b967ff4364528ebd686b002a6ee00f00f4657/wheezy/Dockerfile)
-	[`wheezy-backports` (*wheezy/backports/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/589b967ff4364528ebd686b002a6ee00f00f4657/wheezy/backports/Dockerfile)
+-	[`8.6`, `8`, `jessie`, `latest` (*jessie/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/88ae21052affd8a14553bb969f9d41c464032122/jessie/Dockerfile)
+-	[`jessie-backports` (*jessie/backports/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/88ae21052affd8a14553bb969f9d41c464032122/jessie/backports/Dockerfile)
+-	[`oldstable` (*oldstable/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/a687a618203e1c0891b42d684ac72a85e1f0bfa6/oldstable/Dockerfile)
+-	[`oldstable-backports` (*oldstable/backports/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/a687a618203e1c0891b42d684ac72a85e1f0bfa6/oldstable/backports/Dockerfile)
+-	[`sid` (*sid/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/ee8b1cb93b20e3b9afc264126f1fe9b5518735c5/sid/Dockerfile)
+-	[`stable` (*stable/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/88ae21052affd8a14553bb969f9d41c464032122/stable/Dockerfile)
+-	[`stable-backports` (*stable/backports/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/88ae21052affd8a14553bb969f9d41c464032122/stable/backports/Dockerfile)
+-	[`stretch` (*stretch/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/ee8b1cb93b20e3b9afc264126f1fe9b5518735c5/stretch/Dockerfile)
+-	[`testing` (*testing/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/ee8b1cb93b20e3b9afc264126f1fe9b5518735c5/testing/Dockerfile)
+-	[`unstable` (*unstable/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/ee8b1cb93b20e3b9afc264126f1fe9b5518735c5/unstable/Dockerfile)
+-	[`7.11`, `7`, `wheezy` (*wheezy/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/a687a618203e1c0891b42d684ac72a85e1f0bfa6/wheezy/Dockerfile)
+-	[`wheezy-backports` (*wheezy/backports/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/a687a618203e1c0891b42d684ac72a85e1f0bfa6/wheezy/backports/Dockerfile)
 -	[`rc-buggy` (*debian/rc-buggy/Dockerfile*)](https://github.com/tianon/dockerfiles/blob/22a998f815d55217afa0075411b810b8889ceac1/debian/rc-buggy/Dockerfile)
 -	[`experimental` (*debian/experimental/Dockerfile*)](https://github.com/tianon/dockerfiles/blob/22a998f815d55217afa0075411b810b8889ceac1/debian/experimental/Dockerfile)

@ -38,6 +38,18 @@ The mirror of choice for these images is [the httpredir.debian.org redirecting m

 If you find yourself needing a Debian release which is EOL (and thus only available from [archive.debian.org](http://archive.debian.org)), you should check out [the `debian/eol` image](https://hub.docker.com/r/debian/eol/), which includes tags for Debian releases as far back as Potato (Debian 2.2), the first release to fully utilize APT.

+## Locales
+
+Given that it is a faithful "minbase" install of Debian, this image only includes the `C`, `C.UTF-8`, and `POSIX` locales by default. For most uses requiring a UTF-8 locale, `C.UTF-8` is likely sufficient (`-e LANG=C.UTF-8` or `ENV LANG C.UTF-8`).
+
+For uses where that is not sufficient, other locales can be installed/generated via the `locales` package. [PostgreSQL has a good example of doing so](https://github.com/docker-library/postgres/blob/69bc540ecfffecce72d49fa7e4a46680350037f9/9.6/Dockerfile#L21-L24), copied below:
+
+```dockerfile
+RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \
+	&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+ENV LANG en_US.utf8
+```
+
 ## How It's Made

 If you are curious about what goes into creating this image, please see [`contrib/mkimage.sh` in `github.com/docker/docker`](https://github.com/docker/docker/blob/master/contrib/mkimage.sh) (and [`contrib/mkimage/debootstrap` in the same repo](https://github.com/docker/docker/blob/master/contrib/mkimage/debootstrap)).
--- a/debian/content.md
+++ b/debian/content.md
@ -17,6 +17,18 @@ The mirror of choice for these images is [the httpredir.debian.org redirecting m

 If you find yourself needing a Debian release which is EOL (and thus only available from [archive.debian.org](http://archive.debian.org)), you should check out [the `debian/eol` image](https://hub.docker.com/r/debian/eol/), which includes tags for Debian releases as far back as Potato (Debian 2.2), the first release to fully utilize APT.

+## Locales
+
+Given that it is a faithful "minbase" install of Debian, this image only includes the `C`, `C.UTF-8`, and `POSIX` locales by default. For most uses requiring a UTF-8 locale, `C.UTF-8` is likely sufficient (`-e LANG=C.UTF-8` or `ENV LANG C.UTF-8`).
+
+For uses where that is not sufficient, other locales can be installed/generated via the `locales` package. [PostgreSQL has a good example of doing so](https://github.com/docker-library/postgres/blob/69bc540ecfffecce72d49fa7e4a46680350037f9/9.6/Dockerfile#L21-L24), copied below:
+
+```dockerfile
+RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \
+	&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+ENV LANG en_US.utf8
+```
+
 ## How It's Made

 If you are curious about what goes into creating this image, please see [`contrib/mkimage.sh` in `github.com/docker/docker`](https://github.com/docker/docker/blob/master/contrib/mkimage.sh) (and [`contrib/mkimage/debootstrap` in the same repo](https://github.com/docker/docker/blob/master/contrib/mkimage/debootstrap)).
--- a/django/README.md
+++ b/django/README.md
@ -1,8 +1,33 @@
+# **DEPRECATED**
+
+This image is officially deprecated in favor of [the standard `python` image](https://hub.docker.com/_/python/), and will receive no further updates after 2016-12-31 (Dec 31, 2016). Please adjust your usage accordingly.
+
+For most usages of this image, it was already not bringing in `django` from this image, but actually from your project's `requirements.txt`, so the only "value" being added here was the pre-installing of `mysql-client`, `postgresql-client`, and `sqlite3` for various uses of the `django` framework.
+
+For example, a `Dockerfile` similar to the following would be a good starting point for a Django project using PostgreSQL:
+
+```dockerfile
+FROM python:3.4
+
+RUN apt-get update \
+	&& apt-get install -y --no-install-recommends \
+		postgresql-client \
+	&& rm -rf /var/lib/apt/lists/*
+
+WORKDIR /usr/src/app
+COPY requirements.txt ./
+RUN pip install -r requirements.txt
+COPY . .
+
+EXPOSE 8000
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
+```
+
 # Supported tags and respective `Dockerfile` links

-	[`1.10-python3`, `1-python3`, `python3`, `1.10`, `1`, `latest` (*3.4/Dockerfile*)](https://github.com/docker-library/django/blob/eb6088320ccd1449f21c4050583bd835913e56ec/3.4/Dockerfile)
+-	[`1.10.1-python3`, `1.10-python3`, `1-python3`, `python3`, `1.10.1`, `1.10`, `1`, `latest` (*3.4/Dockerfile*)](https://github.com/docker-library/django/blob/16723cfa3765534e4e9eebe4f70c5404eb2b4532/3.4/Dockerfile)
 -	[`python3-onbuild`, `onbuild` (*3.4/onbuild/Dockerfile*)](https://github.com/docker-library/django/blob/4fe080675e4a85ef6ee25c811e9d3d3ef0905794/3.4/onbuild/Dockerfile)
-	[`1.10-python2`, `1-python2`, `python2` (*2.7/Dockerfile*)](https://github.com/docker-library/django/blob/eb6088320ccd1449f21c4050583bd835913e56ec/2.7/Dockerfile)
+-	[`1.10.1-python2`, `1.10-python2`, `1-python2`, `python2` (*2.7/Dockerfile*)](https://github.com/docker-library/django/blob/16723cfa3765534e4e9eebe4f70c5404eb2b4532/2.7/Dockerfile)
 -	[`python2-onbuild` (*2.7/onbuild/Dockerfile*)](https://github.com/docker-library/django/blob/cecbb2bbbcb69d1b8358398eaf8d9638e3bdd447/2.7/onbuild/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/django`)](https://github.com/docker-library/official-images/blob/master/library/django). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fdjango).
--- a/django/deprecated.md
+++ b/django/deprecated.md
@ -0,0 +1,22 @@
+This image is officially deprecated in favor of [the standard `python` image](https://hub.docker.com/_/python/), and will receive no further updates after 2016-12-31 (Dec 31, 2016). Please adjust your usage accordingly.
+
+For most usages of this image, it was already not bringing in `django` from this image, but actually from your project's `requirements.txt`, so the only "value" being added here was the pre-installing of `mysql-client`, `postgresql-client`, and `sqlite3` for various uses of the `django` framework.
+
+For example, a `Dockerfile` similar to the following would be a good starting point for a Django project using PostgreSQL:
+
+```dockerfile
+FROM python:3.4
+
+RUN apt-get update \
+	&& apt-get install -y --no-install-recommends \
+		postgresql-client \
+	&& rm -rf /var/lib/apt/lists/*
+
+WORKDIR /usr/src/app
+COPY requirements.txt ./
+RUN pip install -r requirements.txt
+COPY . .
+
+EXPOSE 8000
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
+```
--- a/docker/README.md
+++ b/docker/README.md
@ -1,5 +1,11 @@
 # Supported tags and respective `Dockerfile` links

+-	[`1.12.2-rc1`, `1.12-rc`, `rc` (*1.12-rc/Dockerfile*)](https://github.com/docker-library/docker/blob/dba6c6279614ac0a7e520f0b7f7c027250488a4f/1.12-rc/Dockerfile)
+-	[`1.12.2-rc1-dind`, `1.12-rc-dind`, `rc-dind` (*1.12-rc/dind/Dockerfile*)](https://github.com/docker-library/docker/blob/dba6c6279614ac0a7e520f0b7f7c027250488a4f/1.12-rc/dind/Dockerfile)
+-	[`1.12.2-rc1-git`, `1.12-rc-git`, `rc-git` (*1.12-rc/git/Dockerfile*)](https://github.com/docker-library/docker/blob/dba6c6279614ac0a7e520f0b7f7c027250488a4f/1.12-rc/git/Dockerfile)
+-	[`1.12.2-rc1-experimental`, `1.12-rc-experimental`, `rc-experimental` (*1.12-rc/experimental/Dockerfile*)](https://github.com/docker-library/docker/blob/dba6c6279614ac0a7e520f0b7f7c027250488a4f/1.12-rc/experimental/Dockerfile)
+-	[`1.12.2-rc1-experimental-dind`, `1.12-rc-experimental-dind`, `rc-experimental-dind` (*1.12-rc/experimental/dind/Dockerfile*)](https://github.com/docker-library/docker/blob/dba6c6279614ac0a7e520f0b7f7c027250488a4f/1.12-rc/experimental/dind/Dockerfile)
+-	[`1.12.2-rc1-experimental-git`, `1.12-rc-experimental-git`, `rc-experimental-git` (*1.12-rc/experimental/git/Dockerfile*)](https://github.com/docker-library/docker/blob/dba6c6279614ac0a7e520f0b7f7c027250488a4f/1.12-rc/experimental/git/Dockerfile)
 -	[`1.12.1`, `1.12`, `1`, `latest` (*1.12/Dockerfile*)](https://github.com/docker-library/docker/blob/e65e856a4226445f865ec51ea4b6d3bc8353386b/1.12/Dockerfile)
 -	[`1.12.1-dind`, `1.12-dind`, `1-dind`, `dind` (*1.12/dind/Dockerfile*)](https://github.com/docker-library/docker/blob/746d9052066ccfbcb98df7d9ae71cf05d8877419/1.12/dind/Dockerfile)
 -	[`1.12.1-git`, `1.12-git`, `1-git`, `git` (*1.12/git/Dockerfile*)](https://github.com/docker-library/docker/blob/746d9052066ccfbcb98df7d9ae71cf05d8877419/1.12/git/Dockerfile)
--- a/drupal/README.md
+++ b/drupal/README.md
@ -2,10 +2,10 @@

 -	[`7.50-apache`, `7-apache`, `7.50`, `7` (*7/apache/Dockerfile*)](https://github.com/docker-library/drupal/blob/61f25e58353d7ca9b2e07a46ff152892b2f7d9cf/7/apache/Dockerfile)
 -	[`7.50-fpm`, `7-fpm` (*7/fpm/Dockerfile*)](https://github.com/docker-library/drupal/blob/61f25e58353d7ca9b2e07a46ff152892b2f7d9cf/7/fpm/Dockerfile)
-	[`8.1.8-apache`, `8.1-apache`, `8-apache`, `apache`, `8.1.8`, `8.1`, `8`, `latest` (*8.1/apache/Dockerfile*)](https://github.com/docker-library/drupal/blob/61f25e58353d7ca9b2e07a46ff152892b2f7d9cf/8.1/apache/Dockerfile)
-	[`8.1.8-fpm`, `8.1-fpm`, `8-fpm`, `fpm` (*8.1/fpm/Dockerfile*)](https://github.com/docker-library/drupal/blob/61f25e58353d7ca9b2e07a46ff152892b2f7d9cf/8.1/fpm/Dockerfile)
-	[`8.2.0-beta3-apache`, `8.2.0-apache`, `8.2-apache`, `8.2.0-beta3`, `8.2.0`, `8.2` (*8.2/apache/Dockerfile*)](https://github.com/docker-library/drupal/blob/61f25e58353d7ca9b2e07a46ff152892b2f7d9cf/8.2/apache/Dockerfile)
-	[`8.2.0-beta3-fpm`, `8.2.0-fpm`, `8.2-fpm` (*8.2/fpm/Dockerfile*)](https://github.com/docker-library/drupal/blob/61f25e58353d7ca9b2e07a46ff152892b2f7d9cf/8.2/fpm/Dockerfile)
+-	[`8.1.10-apache`, `8.1-apache`, `8-apache`, `apache`, `8.1.10`, `8.1`, `8`, `latest` (*8.1/apache/Dockerfile*)](https://github.com/docker-library/drupal/blob/35aada37a9179e8e9e70d29bbbb894ade2cad36a/8.1/apache/Dockerfile)
+-	[`8.1.10-fpm`, `8.1-fpm`, `8-fpm`, `fpm` (*8.1/fpm/Dockerfile*)](https://github.com/docker-library/drupal/blob/35aada37a9179e8e9e70d29bbbb894ade2cad36a/8.1/fpm/Dockerfile)
+-	[`8.2.0-rc2-apache`, `8.2.0-apache`, `8.2-apache`, `8.2.0-rc2`, `8.2.0`, `8.2` (*8.2/apache/Dockerfile*)](https://github.com/docker-library/drupal/blob/7996e3654f78992d322619358aa7277b99c857ca/8.2/apache/Dockerfile)
+-	[`8.2.0-rc2-fpm`, `8.2.0-fpm`, `8.2-fpm` (*8.2/fpm/Dockerfile*)](https://github.com/docker-library/drupal/blob/7996e3654f78992d322619358aa7277b99c857ca/8.2/fpm/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/drupal`)](https://github.com/docker-library/official-images/blob/master/library/drupal). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fdrupal).

--- a/eggdrop/README.md
+++ b/eggdrop/README.md
@ -1,6 +1,7 @@
 # Supported tags and respective `Dockerfile` links

-	[`1.8`, `1.8.0`, `develop` (*1.8/Dockerfile*)](https://github.com/eggheads/eggdrop-docker/blob/49321b7d9b37d7a177a9a1b9c5f14eb13df5e204/1.8/Dockerfile)
+-	[`develop` (*1.8/Dockerfile*)](https://github.com/eggheads/eggdrop-docker/blob/4ae97421deb6751d767f0f4bf3102f60a3dc0093/1.8/Dockerfile)
+-	[`1.8`, `1.8.0`, `1.8.0rc1` (*1.8rc1/Dockerfile*)](https://github.com/eggheads/eggdrop-docker/blob/1553e9c0483811ace4bbd6a3b1b37eaf8d49dac0/1.8rc1/Dockerfile)
 -	[`1.6`, `1.6.21`, `stable`, `latest` (*1.6/Dockerfile*)](https://github.com/eggheads/eggdrop-docker/blob/87d717b0c05d4c43460a411c9871e9190c94f8bb/1.6/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/eggdrop`)](https://github.com/docker-library/official-images/blob/master/library/eggdrop). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Feggdrop).
--- a/elasticsearch/README.md
+++ b/elasticsearch/README.md
@ -7,7 +7,7 @@
 -	[`2.1.2`, `2.1` (*2.1/Dockerfile*)](https://github.com/docker-library/elasticsearch/blob/2536978b4ef8b58866e933f7e6918ba7161802ac/2.1/Dockerfile)
 -	[`2.2.2`, `2.2` (*2.2/Dockerfile*)](https://github.com/docker-library/elasticsearch/blob/2536978b4ef8b58866e933f7e6918ba7161802ac/2.2/Dockerfile)
 -	[`2.3.5`, `2.3` (*2.3/Dockerfile*)](https://github.com/docker-library/elasticsearch/blob/2536978b4ef8b58866e933f7e6918ba7161802ac/2.3/Dockerfile)
-	[`2.4.0`, `2.4`, `2`, `latest` (*2.4/Dockerfile*)](https://github.com/docker-library/elasticsearch/blob/7a502275158cac1affa4372eab937a21913cd3e0/2.4/Dockerfile)
+-	[`2.4.1`, `2.4`, `2`, `latest` (*2.4/Dockerfile*)](https://github.com/docker-library/elasticsearch/blob/e74f9ba98e26221af4a3103d65ff519621e989d2/2.4/Dockerfile)
 -	[`5.0.0-alpha5`, `5.0.0`, `5.0`, `5` (*5.0/Dockerfile*)](https://github.com/docker-library/elasticsearch/blob/2536978b4ef8b58866e933f7e6918ba7161802ac/5.0/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/elasticsearch`)](https://github.com/docker-library/official-images/blob/master/library/elasticsearch). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Felasticsearch).
--- a/elixir/README.md
+++ b/elixir/README.md
@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links

-	[`1.3.2`, `1.3`, `latest` (*1.3/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/ec6d6952600bbe05ccd7c19c22a82fc70316733b/1.3/Dockerfile)
-	[`1.3.2-slim`, `1.3-slim`, `slim` (*1.3/slim/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/ec6d6952600bbe05ccd7c19c22a82fc70316733b/1.3/slim/Dockerfile)
+-	[`1.3.3`, `1.3`, `latest` (*1.3/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/ded1bb8a2438374853a5a94a3ef1171d081dacff/1.3/Dockerfile)
+-	[`1.3.3-slim`, `1.3-slim`, `slim` (*1.3/slim/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/ded1bb8a2438374853a5a94a3ef1171d081dacff/1.3/slim/Dockerfile)
 -	[`1.2.6`, `1.2` (*1.2/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/77b9a3da43ce035327ae29083e567191d60a6ac8/1.2/Dockerfile)
 -	[`1.2.6-slim`, `1.2-slim` (*1.2/slim/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/77b9a3da43ce035327ae29083e567191d60a6ac8/1.2/slim/Dockerfile)

--- a/erlang/README.md
+++ b/erlang/README.md
@ -1,8 +1,8 @@
 # Supported tags and respective `Dockerfile` links

-	[`19.0.5`, `19.0`, `19`, `latest` (*19/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/7f5e7b4768136caa5f15e0b84d6b503fa430ef7b/19/Dockerfile)
-	[`19.0.5-slim`, `19.0-slim`, `19-slim`, `slim` (*19/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/7f5e7b4768136caa5f15e0b84d6b503fa430ef7b/19/slim/Dockerfile)
-	[`19.0.5-onbuild`, `19.0-onbuild`, `19-onbuild`, `onbuild` (*19/onbuild/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/847b82cdb8896d8d865bf32f2833787b5c62587c/19/onbuild/Dockerfile)
+-	[`19.1`, `19`, `latest` (*19/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/9be249effe93e3c61fa0749078e55ef8d050a16e/19/Dockerfile)
+-	[`19.1-slim`, `19-slim`, `slim` (*19/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/9be249effe93e3c61fa0749078e55ef8d050a16e/19/slim/Dockerfile)
+-	[`19.1-onbuild`, `19-onbuild`, `onbuild` (*19/onbuild/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/9be249effe93e3c61fa0749078e55ef8d050a16e/19/onbuild/Dockerfile)
 -	[`18.3.4.4`, `18.3.4`, `18.3`, `18` (*18/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/7f5e7b4768136caa5f15e0b84d6b503fa430ef7b/18/Dockerfile)
 -	[`18.3.4.4-slim`, `18.3.4-slim`, `18.3-slim`, `18-slim` (*18/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/7f5e7b4768136caa5f15e0b84d6b503fa430ef7b/18/slim/Dockerfile)
 -	[`18.3.4.4-onbuild`, `18.3.4-onbuild`, `18.3-onbuild`, `18-onbuild` (*18/onbuild/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/20e41464075dc0fc76709be77701530eddb6fe33/18/onbuild/Dockerfile)
--- a/gcc/README.md
+++ b/gcc/README.md
@ -1,8 +1,8 @@
 # Supported tags and respective `Dockerfile` links

-	[`5.2.0`, `5.2` (*5.2/Dockerfile*)](https://github.com/docker-library/gcc/blob/df055b1ba29bd666470f4735f2a7bab9acffd0b3/5.2/Dockerfile)
-	[`5.3.0`, `5.3`, `5` (*5.3/Dockerfile*)](https://github.com/docker-library/gcc/blob/df055b1ba29bd666470f4735f2a7bab9acffd0b3/5.3/Dockerfile)
-	[`6.1.0`, `6.1`, `6`, `latest` (*6.1/Dockerfile*)](https://github.com/docker-library/gcc/blob/d9c8446748f7d69626f2e9425376a6672fff09af/6.1/Dockerfile)
+-	[`4.9.4`, `4.9`, `4` (*4.9/Dockerfile*)](https://github.com/docker-library/gcc/blob/8c7687860cdd4ef9227c249ca4587984e2636a55/4.9/Dockerfile)
+-	[`5.4.0`, `5.4`, `5` (*5/Dockerfile*)](https://github.com/docker-library/gcc/blob/8c7687860cdd4ef9227c249ca4587984e2636a55/5/Dockerfile)
+-	[`6.2.0`, `6.2`, `6`, `latest` (*6/Dockerfile*)](https://github.com/docker-library/gcc/blob/8c7687860cdd4ef9227c249ca4587984e2636a55/6/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/gcc`)](https://github.com/docker-library/official-images/blob/master/library/gcc). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fgcc).

--- a/generate-repo-stub-readme.sh
+++ b/generate-repo-stub-readme.sh
@ -19,7 +19,11 @@ fi
 gitRepo='https://github.com/docker-library/docs'
 hubPage="https://registry.hub.docker.com/_/$repo/"

-canonicalRepo="$(curl -fsSLI -o /dev/null -w '%{url_effective}\n' "https://github.com/docker-library/$repo")" # follow redirects (http://stackoverflow.com/a/3077316/433558)
+canonicalRepo="https://github.com/docker-library/$repo"
+if [ -s "$repo/github-repo" ]; then
+	canonicalRepo="$(< "$repo/github-repo")"
+fi
+canonicalRepo="$(curl -fsSLI -o /dev/null -w '%{url_effective}\n' "$canonicalRepo")" # follow redirects (http://stackoverflow.com/a/3077316/433558)
 travisRepo="${canonicalRepo#*://github.com/}"

 cat <<EOREADME
@ -30,8 +34,37 @@ This is the Git repo of the Docker [official image](https://docs.docker.com/dock
 The full readme is generated over in [docker-library/docs]($gitRepo), specifically in [docker-library/docs/$repo]($gitRepo/tree/master/$repo).

 See a change merged here that doesn't show up on the Docker Hub yet? Check [the "library/$repo" manifest file in the docker-library/official-images repo](https://github.com/docker-library/official-images/blob/master/library/$repo), especially [PRs with the "library/$repo" label on that repo](https://github.com/docker-library/official-images/labels/library%2F$repo). For more information about the official images process, see the [docker-library/official-images readme](https://github.com/docker-library/official-images/blob/master/README.md).
-
-[![Travis CI](https://img.shields.io/travis/$travisRepo/master.svg)](https://travis-ci.org/$travisRepo/branches)
-
-<!-- THIS FILE IS GENERATED BY https://github.com/docker-library/docs/blob/master/generate-repo-stub-readme.sh -->
+EOREADME
+
+badges=()
+
+n=$'\n'
+t=$'\t'
+
+travisImage="https://img.shields.io/travis/$travisRepo/master.svg"
+if wget -q --spider "$travisImage" &> /dev/null; then
+	travisLink="https://travis-ci.org/$travisRepo/branches"
+	badges+=( "-${t}[Travis CI:  ${n}${t}![build status badge]($travisImage)]($travisLink)" )
+fi
+
+jenkinsImage="https://doi-janky.infosiftr.net/job/update.sh/job/$repo/badge/icon"
+if wget -q --spider "$jenkinsImage" &> /dev/null; then
+	jenkinsLink="https://doi-janky.infosiftr.net/job/update.sh/job/$repo"
+	badges+=( "-${t}[Automated \`update.sh\`:  ${n}${t}![build status badge]($jenkinsImage)]($jenkinsLink)" )
+fi
+
+if [ "${#badges[@]}" -gt 0 ]; then
+	IFS=$'\n'
+	cat <<-EOREADME
+
+		---
+
+		${badges[*]}
+	EOREADME
+	unset IFS
+fi
+
+cat <<EOREADME
+
+<!-- THIS FILE IS GENERATED BY $gitRepo/blob/master/generate-repo-stub-readme.sh -->
 EOREADME
--- a/ghost/README.md
+++ b/ghost/README.md
@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links

-	[`0.10.0`, `0.10`, `0`, `latest` (*Dockerfile*)](https://github.com/docker-library/ghost/blob/b1a49c5deb435395b4720575ef2bf46f1396d82f/Dockerfile)
+-	[`0.11.0`, `0.11`, `0`, `latest` (*Dockerfile*)](https://github.com/docker-library/ghost/blob/e9592030a951f9fd865cfabcc05252326e7192a7/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). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fghost).

--- a/golang/README.md
+++ b/golang/README.md
@ -1,15 +1,15 @@
 # Supported tags and respective `Dockerfile` links

-	[`1.6.3`, `1.6` (*1.6/Dockerfile*)](https://github.com/docker-library/golang/blob/9f666dc2f4f51df564613f787d28b3a2353243e0/1.6/Dockerfile)
+-	[`1.6.3`, `1.6` (*1.6/Dockerfile*)](https://github.com/docker-library/golang/blob/85df9970e9548f38248d36f6f4341e2aea128515/1.6/Dockerfile)
 -	[`1.6.3-onbuild`, `1.6-onbuild` (*1.6/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/ce284e14cdee73fbaa8fb680011a812f272eae2e/1.6/onbuild/Dockerfile)
-	[`1.6.3-wheezy`, `1.6-wheezy` (*1.6/wheezy/Dockerfile*)](https://github.com/docker-library/golang/blob/9f666dc2f4f51df564613f787d28b3a2353243e0/1.6/wheezy/Dockerfile)
+-	[`1.6.3-wheezy`, `1.6-wheezy` (*1.6/wheezy/Dockerfile*)](https://github.com/docker-library/golang/blob/85df9970e9548f38248d36f6f4341e2aea128515/1.6/wheezy/Dockerfile)
 -	[`1.6.3-alpine`, `1.6-alpine` (*1.6/alpine/Dockerfile*)](https://github.com/docker-library/golang/blob/9f666dc2f4f51df564613f787d28b3a2353243e0/1.6/alpine/Dockerfile)
 -	[`1.6.3-windowsservercore`, `1.6-windowsservercore` (*1.6/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/golang/blob/83760719bbaadb8d778aa48d53bf2e9d9bd55741/1.6/windows/windowsservercore/Dockerfile)
-	[`1.7.0`, `1.7`, `1`, `latest` (*1.7/Dockerfile*)](https://github.com/docker-library/golang/blob/ba5f6a10dcc46edeb66377261f873e3b61af36f5/1.7/Dockerfile)
-	[`1.7.0-onbuild`, `1.7-onbuild`, `1-onbuild`, `onbuild` (*1.7/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/2372c8cafe9cc958bade33ad0b8b54de8869c21f/1.7/onbuild/Dockerfile)
-	[`1.7.0-wheezy`, `1.7-wheezy`, `1-wheezy`, `wheezy` (*1.7/wheezy/Dockerfile*)](https://github.com/docker-library/golang/blob/ba5f6a10dcc46edeb66377261f873e3b61af36f5/1.7/wheezy/Dockerfile)
-	[`1.7.0-alpine`, `1.7-alpine`, `1-alpine`, `alpine` (*1.7/alpine/Dockerfile*)](https://github.com/docker-library/golang/blob/ba5f6a10dcc46edeb66377261f873e3b61af36f5/1.7/alpine/Dockerfile)
-	[`1.7.0-windowsservercore`, `1.7-windowsservercore`, `1-windowsservercore`, `windowsservercore` (*1.7/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/golang/blob/ba5f6a10dcc46edeb66377261f873e3b61af36f5/1.7/windows/windowsservercore/Dockerfile)
+-	[`1.7.1`, `1.7`, `1`, `latest` (*1.7/Dockerfile*)](https://github.com/docker-library/golang/blob/85df9970e9548f38248d36f6f4341e2aea128515/1.7/Dockerfile)
+-	[`1.7.1-onbuild`, `1.7-onbuild`, `1-onbuild`, `onbuild` (*1.7/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/2372c8cafe9cc958bade33ad0b8b54de8869c21f/1.7/onbuild/Dockerfile)
+-	[`1.7.1-wheezy`, `1.7-wheezy`, `1-wheezy`, `wheezy` (*1.7/wheezy/Dockerfile*)](https://github.com/docker-library/golang/blob/85df9970e9548f38248d36f6f4341e2aea128515/1.7/wheezy/Dockerfile)
+-	[`1.7.1-alpine`, `1.7-alpine`, `1-alpine`, `alpine` (*1.7/alpine/Dockerfile*)](https://github.com/docker-library/golang/blob/3a3e91c242b58a7d4e6022b3710b2e871f0ee5d6/1.7/alpine/Dockerfile)
+-	[`1.7.1-windowsservercore`, `1.7-windowsservercore`, `1-windowsservercore`, `windowsservercore` (*1.7/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/golang/blob/3a3e91c242b58a7d4e6022b3710b2e871f0ee5d6/1.7/windows/windowsservercore/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/golang`)](https://github.com/docker-library/official-images/blob/master/library/golang). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fgolang).

--- a/httpd/README.md
+++ b/httpd/README.md
@ -1,9 +1,9 @@
 # Supported tags and respective `Dockerfile` links

-	[`2.2.31`, `2.2` (*2.2/Dockerfile*)](https://github.com/docker-library/httpd/blob/12bf8c8883340c98b3988a7bade8ef2d0d6dcf8a/2.2/Dockerfile)
-	[`2.2.31-alpine`, `2.2-alpine` (*2.2/alpine/Dockerfile*)](https://github.com/docker-library/httpd/blob/12bf8c8883340c98b3988a7bade8ef2d0d6dcf8a/2.2/alpine/Dockerfile)
-	[`2.4.23`, `2.4`, `2`, `latest` (*2.4/Dockerfile*)](https://github.com/docker-library/httpd/blob/12bf8c8883340c98b3988a7bade8ef2d0d6dcf8a/2.4/Dockerfile)
-	[`2.4.23-alpine`, `2.4-alpine`, `2-alpine`, `alpine` (*2.4/alpine/Dockerfile*)](https://github.com/docker-library/httpd/blob/12bf8c8883340c98b3988a7bade8ef2d0d6dcf8a/2.4/alpine/Dockerfile)
+-	[`2.2.31`, `2.2` (*2.2/Dockerfile*)](https://github.com/docker-library/httpd/blob/b13054c7de5c74bbaa6d595dbe38969e6d4f860c/2.2/Dockerfile)
+-	[`2.2.31-alpine`, `2.2-alpine` (*2.2/alpine/Dockerfile*)](https://github.com/docker-library/httpd/blob/b13054c7de5c74bbaa6d595dbe38969e6d4f860c/2.2/alpine/Dockerfile)
+-	[`2.4.23`, `2.4`, `2`, `latest` (*2.4/Dockerfile*)](https://github.com/docker-library/httpd/blob/b13054c7de5c74bbaa6d595dbe38969e6d4f860c/2.4/Dockerfile)
+-	[`2.4.23-alpine`, `2.4-alpine`, `2-alpine`, `alpine` (*2.4/alpine/Dockerfile*)](https://github.com/docker-library/httpd/blob/b13054c7de5c74bbaa6d595dbe38969e6d4f860c/2.4/alpine/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/httpd`)](https://github.com/docker-library/official-images/blob/master/library/httpd). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fhttpd).

--- a/ibmjava/README.md
+++ b/ibmjava/README.md
@ -1,10 +1,10 @@
 # Supported tags and respective `Dockerfile` links

-	[`8-jre`, `jre`, `8`, `latest` (*ibmjava/8-jre/x86_64/ubuntu/Dockerfile*)](https://github.com/ibmruntimes/ci.docker/blob/b9765ee26706884459e96ed701415add510e6944/ibmjava/8-jre/x86_64/ubuntu/Dockerfile)
-	[`8-jre-alpine`, `jre-alpine` (*ibmjava/8-jre/x86_64/alpine/Dockerfile*)](https://github.com/ibmruntimes/ci.docker/blob/0c67d341472c6aae479701a649f6433a7c03f486/ibmjava/8-jre/x86_64/alpine/Dockerfile)
-	[`8-sfj`, `sfj` (*ibmjava/8-sfj/x86_64/ubuntu/Dockerfile*)](https://github.com/ibmruntimes/ci.docker/blob/b9765ee26706884459e96ed701415add510e6944/ibmjava/8-sfj/x86_64/ubuntu/Dockerfile)
-	[`8-sfj-alpine`, `sfj-alpine` (*ibmjava/8-sfj/x86_64/alpine/Dockerfile*)](https://github.com/ibmruntimes/ci.docker/blob/0c67d341472c6aae479701a649f6433a7c03f486/ibmjava/8-sfj/x86_64/alpine/Dockerfile)
-	[`8-sdk`, `sdk` (*ibmjava/8-sdk/x86_64/ubuntu/Dockerfile*)](https://github.com/ibmruntimes/ci.docker/blob/b9765ee26706884459e96ed701415add510e6944/ibmjava/8-sdk/x86_64/ubuntu/Dockerfile)
+-	[`8-jre`, `jre`, `8`, `latest` (*ibmjava/8-jre/x86_64/ubuntu/Dockerfile*)](https://github.com/ibmruntimes/ci.docker/blob/1f0549ef043eb91ce252dfdd4355cfc890f2ab84/ibmjava/8-jre/x86_64/ubuntu/Dockerfile)
+-	[`8-jre-alpine`, `jre-alpine` (*ibmjava/8-jre/x86_64/alpine/Dockerfile*)](https://github.com/ibmruntimes/ci.docker/blob/1f0549ef043eb91ce252dfdd4355cfc890f2ab84/ibmjava/8-jre/x86_64/alpine/Dockerfile)
+-	[`8-sfj`, `sfj` (*ibmjava/8-sfj/x86_64/ubuntu/Dockerfile*)](https://github.com/ibmruntimes/ci.docker/blob/1f0549ef043eb91ce252dfdd4355cfc890f2ab84/ibmjava/8-sfj/x86_64/ubuntu/Dockerfile)
+-	[`8-sfj-alpine`, `sfj-alpine` (*ibmjava/8-sfj/x86_64/alpine/Dockerfile*)](https://github.com/ibmruntimes/ci.docker/blob/1f0549ef043eb91ce252dfdd4355cfc890f2ab84/ibmjava/8-sfj/x86_64/alpine/Dockerfile)
+-	[`8-sdk`, `sdk` (*ibmjava/8-sdk/x86_64/ubuntu/Dockerfile*)](https://github.com/ibmruntimes/ci.docker/blob/1f0549ef043eb91ce252dfdd4355cfc890f2ab84/ibmjava/8-sdk/x86_64/ubuntu/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/ibmjava`)](https://github.com/docker-library/official-images/blob/master/library/ibmjava). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fibmjava).

@ -12,7 +12,7 @@ For detailed information about the virtual/transfer sizes and individual layers

 ### Overview

-The images in this repository contain IBM® SDK, Java™ Technology Edition, version 1.8.0\_sr3fp10 (8.0-3.10). See [what's new](http://www.ibm.com/support/knowledgecenter/SSYKE2_8.0.0/com.ibm.java.lnx.80.doc/diag/preface/changes_80/whatsnew_sr3fp10.html). See the license section for restrictions that relate to the use of this image. For more information about IBM® SDK, Java™ Technology Edition and API documentation, see the [IBM Knowledge Center](http://www.ibm.com/support/knowledgecenter/SSYKE2/welcome_javasdk_family.html). For tutorials, recipes, and Java usage in Bluemix, see [IBM developerWorks](http://www.ibm.com/developerworks/java).
+The images in this repository contain IBM® SDK, Java™ Technology Edition, version 1.8.0\_sr3fp11 (8.0-3.11). See [what's new](http://www.ibm.com/support/knowledgecenter/en/SSYKE2_8.0.0/com.ibm.java.lnx.80.doc/diag/preface/changes_80/changes.html). See the license section for restrictions that relate to the use of this image. For more information about IBM® SDK, Java™ Technology Edition and API documentation, see the [IBM Knowledge Center](http://www.ibm.com/support/knowledgecenter/SSYKE2/welcome_javasdk_family.html). For tutorials, recipes, and Java usage in Bluemix, see [IBM developerWorks](http://www.ibm.com/developerworks/java).

 Java and all Java-based trademarks and logos are trademarks or registered trademarks of Oracle and/or its affiliates.

@ -26,7 +26,7 @@ The Small Footprint JRE ([SFJ](http://www.ibm.com/support/knowledgecenter/en/SSY

 ##### Alpine Linux

-Consider using [Alpine Linux](http://alpinelinux.org/) if you are concerned about the size of the overall image. Alpine Linux is a stripped down version of Linux that is based on [musl glibc](http://wiki.musl-libc.org/wiki/Functional_differences_from_glibc) and Busybox, resulting in a [Docker image](https://hub.docker.com/_/alpine/) size of approximately 5 MB. Due to its extremely small size and reduced number of installed packages, it has a much smaller attack surface which improves security. However, because the IBM SDK has a dependency on gnu glibc, installing this library adds an extra 8 MB to the image size. The following table compares Docker Image sizes based on the latest JRE `8.0-3.10`.
+Consider using [Alpine Linux](http://alpinelinux.org/) if you are concerned about the size of the overall image. Alpine Linux is a stripped down version of Linux that is based on [musl libc](http://wiki.musl-libc.org/wiki/Functional_differences_from_glibc) and Busybox, resulting in a [Docker image](https://hub.docker.com/_/alpine/) size of approximately 5 MB. Due to its extremely small size and reduced number of installed packages, it has a much smaller attack surface which improves security. However, because the IBM SDK has a dependency on gnu glibc, installing this library adds an extra 8 MB to the image size. The following table compares Docker Image sizes based on the JRE version `8.0-3.10`.

 | JRE    | JRE    | SFJ    | SFJ    |
 |:------:|:------:|:------:|:------:|
--- a/ibmjava/content.md
+++ b/ibmjava/content.md
@ -1,6 +1,6 @@
 ### Overview

-The images in this repository contain IBM® SDK, Java™ Technology Edition, version 1.8.0\_sr3fp10 (8.0-3.10). See [what's new](http://www.ibm.com/support/knowledgecenter/SSYKE2_8.0.0/com.ibm.java.lnx.80.doc/diag/preface/changes_80/whatsnew_sr3fp10.html). See the license section for restrictions that relate to the use of this image. For more information about IBM® SDK, Java™ Technology Edition and API documentation, see the [IBM Knowledge Center](http://www.ibm.com/support/knowledgecenter/SSYKE2/welcome_javasdk_family.html). For tutorials, recipes, and Java usage in Bluemix, see [IBM developerWorks](http://www.ibm.com/developerworks/java).
+The images in this repository contain IBM® SDK, Java™ Technology Edition, version 1.8.0\_sr3fp11 (8.0-3.11). See [what's new](http://www.ibm.com/support/knowledgecenter/en/SSYKE2_8.0.0/com.ibm.java.lnx.80.doc/diag/preface/changes_80/changes.html). See the license section for restrictions that relate to the use of this image. For more information about IBM® SDK, Java™ Technology Edition and API documentation, see the [IBM Knowledge Center](http://www.ibm.com/support/knowledgecenter/SSYKE2/welcome_javasdk_family.html). For tutorials, recipes, and Java usage in Bluemix, see [IBM developerWorks](http://www.ibm.com/developerworks/java).

 Java and all Java-based trademarks and logos are trademarks or registered trademarks of Oracle and/or its affiliates.

@ -14,7 +14,7 @@ The Small Footprint JRE ([SFJ](http://www.ibm.com/support/knowledgecenter/en/SSY

 ##### Alpine Linux

-Consider using [Alpine Linux](http://alpinelinux.org/) if you are concerned about the size of the overall image. Alpine Linux is a stripped down version of Linux that is based on [musl glibc](http://wiki.musl-libc.org/wiki/Functional_differences_from_glibc) and Busybox, resulting in a [Docker image](https://hub.docker.com/_/alpine/) size of approximately 5 MB. Due to its extremely small size and reduced number of installed packages, it has a much smaller attack surface which improves security. However, because the IBM SDK has a dependency on gnu glibc, installing this library adds an extra 8 MB to the image size. The following table compares Docker Image sizes based on the latest JRE `8.0-3.10`.
+Consider using [Alpine Linux](http://alpinelinux.org/) if you are concerned about the size of the overall image. Alpine Linux is a stripped down version of Linux that is based on [musl libc](http://wiki.musl-libc.org/wiki/Functional_differences_from_glibc) and Busybox, resulting in a [Docker image](https://hub.docker.com/_/alpine/) size of approximately 5 MB. Due to its extremely small size and reduced number of installed packages, it has a much smaller attack surface which improves security. However, because the IBM SDK has a dependency on gnu glibc, installing this library adds an extra 8 MB to the image size. The following table compares Docker Image sizes based on the JRE version `8.0-3.10`.

 | JRE    | JRE    | SFJ    | SFJ    |
 |:------:|:------:|:------:|:------:|
--- a/influxdb/README.md
+++ b/influxdb/README.md
@ -1,10 +1,9 @@
 # Supported tags and respective `Dockerfile` links

-	[`0.12`, `0.12.2` (*0.12/Dockerfile*)](https://github.com/influxdata/influxdb-docker/blob/6d869aa598baf9d23019682ecff42d022a00ce17/0.12/Dockerfile)
-	[`0.13`, `0.13.0`, `latest` (*influxdb/0.13/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/22b661b4c141d237669f94e4740f234b7be43a7b/influxdb/0.13/Dockerfile)
-	[`0.13-alpine`, `0.13.0-alpine`, `alpine` (*influxdb/0.13/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/22b661b4c141d237669f94e4740f234b7be43a7b/influxdb/0.13/alpine/Dockerfile)
-	[`1.0.0-rc2` (*influxdb/1.0/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/269f3d4ee4a91ff8fe05d6a1c71a1e0ced1b900b/influxdb/1.0/Dockerfile)
-	[`1.0.0-rc2-alpine` (*influxdb/1.0/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/269f3d4ee4a91ff8fe05d6a1c71a1e0ced1b900b/influxdb/1.0/alpine/Dockerfile)
+-	[`0.13`, `0.13.0` (*influxdb/0.13/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/ec08f02c8a4a15bcea2a6c46517eceb9284633a2/influxdb/0.13/Dockerfile)
+-	[`0.13-alpine`, `0.13.0-alpine` (*influxdb/0.13/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/ec08f02c8a4a15bcea2a6c46517eceb9284633a2/influxdb/0.13/alpine/Dockerfile)
+-	[`1.0`, `1.0.1`, `latest` (*influxdb/1.0/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/d2fb0a4ddcc93a8387aa313a43ff78b0964a379f/influxdb/1.0/Dockerfile)
+-	[`1.0-alpine`, `1.0.1-alpine`, `alpine` (*influxdb/1.0/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/d2fb0a4ddcc93a8387aa313a43ff78b0964a379f/influxdb/1.0/alpine/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/influxdb`)](https://github.com/docker-library/official-images/blob/master/library/influxdb). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Finfluxdb).

--- a/irssi/README.md
+++ b/irssi/README.md
@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links

-	[`0.8.19`, `0.8`, `0`, `latest`, `0.8.19-debian`, `0.8-debian`, `0-debian`, `debian` (*debian/Dockerfile*)](https://github.com/jfrazelle/irssi/blob/1377885afb36b08ec0984e8563f945895776caa8/debian/Dockerfile)
-	[`0.8.19-alpine`, `0.8-alpine`, `0-alpine`, `alpine` (*alpine/Dockerfile*)](https://github.com/jfrazelle/irssi/blob/1377885afb36b08ec0984e8563f945895776caa8/alpine/Dockerfile)
+-	[`0.8.20`, `0.8`, `0`, `latest`, `0.8.20-debian`, `0.8-debian`, `0-debian`, `debian` (*debian/Dockerfile*)](https://github.com/jessfraz/irssi/blob/af1a8245096671eed463d0108c0e786349c31710/debian/Dockerfile)
+-	[`0.8.20-alpine`, `0.8-alpine`, `0-alpine`, `alpine` (*alpine/Dockerfile*)](https://github.com/jessfraz/irssi/blob/af1a8245096671eed463d0108c0e786349c31710/alpine/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/irssi`)](https://github.com/docker-library/official-images/blob/master/library/irssi). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Firssi).

@ -82,7 +82,7 @@ Documentation for this image is stored in the [`irssi/` directory](https://githu

 ## Issues

-If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/jfrazelle/irssi/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
+If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/jessfraz/irssi/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).

 You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).

@ -90,4 +90,4 @@ You can also reach many of the official image maintainers via the `#docker-libra

 You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.

-Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/jfrazelle/irssi/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
+Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/jessfraz/irssi/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
--- a/irssi/github-repo
+++ b/irssi/github-repo
@ -1 +1 @@
-https://github.com/jfrazelle/irssi
+https://github.com/jessfraz/irssi
--- a/java/README.md
+++ b/java/README.md
@ -16,8 +16,8 @@ The image has been OpenJDK-specific since it was first introduced, and as of 201
 -	[`8u92-jdk-alpine`, `8u92-alpine`, `8-jdk-alpine`, `8-alpine`, `jdk-alpine`, `alpine`, `openjdk-8u92-jdk-alpine`, `openjdk-8u92-alpine`, `openjdk-8-jdk-alpine`, `openjdk-8-alpine` (*8-jdk/alpine/Dockerfile*)](https://github.com/docker-library/openjdk/blob/54c64cf47d2b705418feb68b811419a223c5a040/8-jdk/alpine/Dockerfile)
 -	[`8u102-jre`, `8-jre`, `jre`, `openjdk-8u102-jre`, `openjdk-8-jre` (*8-jre/Dockerfile*)](https://github.com/docker-library/openjdk/blob/baaaf7714f9c66e4c5decf2c108a2738b7186c7f/8-jre/Dockerfile)
 -	[`8u92-jre-alpine`, `8-jre-alpine`, `jre-alpine`, `openjdk-8u92-jre-alpine`, `openjdk-8-jre-alpine` (*8-jre/alpine/Dockerfile*)](https://github.com/docker-library/openjdk/blob/54c64cf47d2b705418feb68b811419a223c5a040/8-jre/alpine/Dockerfile)
-	[`9-b133-jdk`, `9-b133`, `9-jdk`, `9`, `openjdk-9-b133-jdk`, `openjdk-9-b133`, `openjdk-9-jdk`, `openjdk-9` (*9-jdk/Dockerfile*)](https://github.com/docker-library/openjdk/blob/2a8c028a7246cd03a96c7cc8f41c4087303c642d/9-jdk/Dockerfile)
-	[`9-b133-jre`, `9-jre`, `openjdk-9-b133-jre`, `openjdk-9-jre` (*9-jre/Dockerfile*)](https://github.com/docker-library/openjdk/blob/2a8c028a7246cd03a96c7cc8f41c4087303c642d/9-jre/Dockerfile)
+-	[`9-b136-jdk`, `9-b136`, `9-jdk`, `9`, `openjdk-9-b136-jdk`, `openjdk-9-b136`, `openjdk-9-jdk`, `openjdk-9` (*9-jdk/Dockerfile*)](https://github.com/docker-library/openjdk/blob/2ff433f60dd918bd852442dbb4f7b24a148c2fb0/9-jdk/Dockerfile)
+-	[`9-b136-jre`, `9-jre`, `openjdk-9-b136-jre`, `openjdk-9-jre` (*9-jre/Dockerfile*)](https://github.com/docker-library/openjdk/blob/2ff433f60dd918bd852442dbb4f7b24a148c2fb0/9-jre/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/java`)](https://github.com/docker-library/official-images/blob/master/library/java). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fjava).

--- a/jenkins/README.md
+++ b/jenkins/README.md
@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links

-	[`latest`, `2.7.3` (*Dockerfile*)](https://github.com/jenkinsci/jenkins-ci.org-docker/blob/f027728bc196bc4ac606c2122fdc483fd5389615/Dockerfile)
-	[`alpine`, `2.7.3-alpine` (*Dockerfile*)](https://github.com/jenkinsci/jenkins-ci.org-docker/blob/147ddb18c8ad3ce21c07ca281a355f452ab940a6/Dockerfile)
+-	[`latest`, `2.7.4` (*Dockerfile*)](https://github.com/jenkinsci/jenkins-ci.org-docker/blob/6eaa9b15926232310317490a3b9975ef61be763c/Dockerfile)
+-	[`alpine`, `2.7.4-alpine` (*Dockerfile*)](https://github.com/jenkinsci/jenkins-ci.org-docker/blob/d2eeb20813164526f0443599fd82fd79fadee77e/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). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fjenkins).

--- a/jetty/README.md
+++ b/jetty/README.md
@ -1,9 +1,9 @@
 # Supported tags and respective `Dockerfile` links

-	[`9.3.11`, `9.3`, `9`, `9.3.11-jre8`, `9.3-jre8`, `9-jre8`, `latest`, `jre8` (*9.3-jre8/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/41c3c040f5868519b806cdab2336b7b8e47f9339/9.3-jre8/Dockerfile)
-	[`9.3.11-alpine`, `9.3-alpine`, `9-alpine`, `9.3.11-jre8-alpine`, `9.3-jre8-alpine`, `9-jre8-alpine`, `alpine`, `jre8-alpine` (*9.3-jre8/alpine/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/41c3c040f5868519b806cdab2336b7b8e47f9339/9.3-jre8/alpine/Dockerfile)
-	[`9.2.18`, `9.2`, `9.2.18-jre8`, `9.2-jre8` (*9.2-jre8/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/41c3c040f5868519b806cdab2336b7b8e47f9339/9.2-jre8/Dockerfile)
-	[`9.2.18-jre7`, `9.2-jre7`, `9-jre7`, `jre7` (*9.2-jre7/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/41c3c040f5868519b806cdab2336b7b8e47f9339/9.2-jre7/Dockerfile)
+-	[`9.3.12`, `9.3`, `9`, `9.3.12-jre8`, `9.3-jre8`, `9-jre8`, `latest`, `jre8` (*9.3-jre8/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/09617a1ddc50bb080df9fa94ec5d636015449dbd/9.3-jre8/Dockerfile)
+-	[`9.3.12-alpine`, `9.3-alpine`, `9-alpine`, `9.3.12-jre8-alpine`, `9.3-jre8-alpine`, `9-jre8-alpine`, `alpine`, `jre8-alpine` (*9.3-jre8/alpine/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/09617a1ddc50bb080df9fa94ec5d636015449dbd/9.3-jre8/alpine/Dockerfile)
+-	[`9.2.19`, `9.2`, `9.2.19-jre8`, `9.2-jre8` (*9.2-jre8/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/422148d13cca3dfe4f4e6299185f7434725f9bd7/9.2-jre8/Dockerfile)
+-	[`9.2.19-jre7`, `9.2-jre7`, `9-jre7`, `jre7` (*9.2-jre7/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/422148d13cca3dfe4f4e6299185f7434725f9bd7/9.2-jre7/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/jetty`)](https://github.com/docker-library/official-images/blob/master/library/jetty). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fjetty).

@ -71,6 +71,14 @@ RUN java -jar "$JETTY_HOME/start.jar" --add-to-startd=jmx,stats

 Modules may be configured in a `Dockerfile` by editing the properties in the corresponding `/var/lib/jetty/start.d/*.mod` file or the module can be deactivated by removing that file.

+### JVM Configuration
+
+JVM options can be set by passing the `JAVA_OPTIONS` environment variable to the container. For example, to set the maximum heap size to 1 gigabyte, you can run the container as follows:
+
+```console
+$ docker run -e JAVA_OPTIONS="-Xmx1g" -d jetty
+```
+
 ## Read-only container

 To run `jetty` as a read-only container, have Docker create the `/tmp/jetty` and `/run/jetty` directories as volumes:
--- a/jetty/content.md
+++ b/jetty/content.md
@ -60,6 +60,14 @@ RUN java -jar "$JETTY_HOME/start.jar" --add-to-startd=jmx,stats

 Modules may be configured in a `Dockerfile` by editing the properties in the corresponding `/var/lib/jetty/start.d/*.mod` file or the module can be deactivated by removing that file.

+### JVM Configuration
+
+JVM options can be set by passing the `JAVA_OPTIONS` environment variable to the container. For example, to set the maximum heap size to 1 gigabyte, you can run the container as follows:
+
+```console
+$ docker run -e JAVA_OPTIONS="-Xmx1g" -d %%REPO%%
+```
+
 ## Read-only container

 To run `%%REPO%%` as a read-only container, have Docker create the `/tmp/jetty` and `/run/jetty` directories as volumes:
--- a/jruby/README.md
+++ b/jruby/README.md
@ -1,10 +1,10 @@
 # Supported tags and respective `Dockerfile` links

-	[`latest`, `9`, `9.1`, `9.1-jre`, `9.1.3`, `9.1.3-jre`, `9.1.3.0`, `9.1.3.0-jre` (*9000/jre/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/61093f39db5e10b485e69ffa9271a6097c562b4d/9000/jre/Dockerfile)
-	[`9-alpine`, `9.1-alpine`, `9.1-jre-alpine`, `9.1.3-alpine`, `9.1.3-jre-alpine`, `9.1.3.0-alpine`, `9.1.3.0-jre-alpine` (*9000/alpine-jre/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/46c09aad60fabd953cdb91c1f317576c0831b230/9000/alpine-jre/Dockerfile)
-	[`9.1-jdk`, `9.1.3-jdk`, `9.1.3.0-jdk` (*9000/jdk/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/61093f39db5e10b485e69ffa9271a6097c562b4d/9000/jdk/Dockerfile)
-	[`9.1-jdk-alpine`, `9.1.3-jdk-alpine`, `9.1.3.0-jdk-alpine` (*9000/alpine-jdk/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/46c09aad60fabd953cdb91c1f317576c0831b230/9000/alpine-jdk/Dockerfile)
-	[`9-onbuild`, `9.1-onbuild`, `9.1.3-onbuild`, `9.1.3.0-onbuild` (*9000/onbuild/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/61093f39db5e10b485e69ffa9271a6097c562b4d/9000/onbuild/Dockerfile)
+-	[`latest`, `9`, `9.1`, `9.1-jre`, `9.1.5`, `9.1.5-jre`, `9.1.5.0`, `9.1.5.0-jre` (*9000/jre/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/d6339011a5cba59f036874de9ca68f7763b192ff/9000/jre/Dockerfile)
+-	[`9-alpine`, `9.1-alpine`, `9.1-jre-alpine`, `9.1.5-alpine`, `9.1.5-jre-alpine`, `9.1.5.0-alpine`, `9.1.5.0-jre-alpine` (*9000/alpine-jre/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/d6339011a5cba59f036874de9ca68f7763b192ff/9000/alpine-jre/Dockerfile)
+-	[`9.1-jdk`, `9.1.5-jdk`, `9.1.5.0-jdk` (*9000/jdk/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/d6339011a5cba59f036874de9ca68f7763b192ff/9000/jdk/Dockerfile)
+-	[`9.1-jdk-alpine`, `9.1.5-jdk-alpine`, `9.1.5.0-jdk-alpine` (*9000/alpine-jdk/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/d6339011a5cba59f036874de9ca68f7763b192ff/9000/alpine-jdk/Dockerfile)
+-	[`9-onbuild`, `9.1-onbuild`, `9.1.5-onbuild`, `9.1.5.0-onbuild` (*9000/onbuild/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/d6339011a5cba59f036874de9ca68f7763b192ff/9000/onbuild/Dockerfile)
 -	[`1.7`, `1.7.25`, `1.7-jre`, `1.7.25-jre` (*1.7/jre/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/ad0479fa0d278f5eb311e01417c079a97305eeb3/1.7/jre/Dockerfile)
 -	[`1.7-jdk`, `1.7.25-jdk` (*1.7/jdk/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/ad0479fa0d278f5eb311e01417c079a97305eeb3/1.7/jdk/Dockerfile)
 -	[`1.7-onbuild`, `1.7.25-onbuild` (*1.7/onbuild/Dockerfile*)](https://github.com/cpuguy83/docker-jruby/blob/ad0479fa0d278f5eb311e01417c079a97305eeb3/1.7/onbuild/Dockerfile)
--- a/julia/README.md
+++ b/julia/README.md
@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links

-	[`0.4.6`, `0.4`, `0`, `latest` (*Dockerfile*)](https://github.com/docker-library/julia/blob/59a01cf8cdb0b0f9cc229aca415755a64226e4ed/Dockerfile)
+-	[`0.5.0`, `0.5`, `0`, `latest` (*Dockerfile*)](https://github.com/docker-library/julia/blob/0f29b23863e4ff1c99b13a30e845b66c7468f79b/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/julia`)](https://github.com/docker-library/official-images/blob/master/library/julia). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fjulia).

--- a/kapacitor/README.md
+++ b/kapacitor/README.md
@ -1,10 +1,9 @@
 # Supported tags and respective `Dockerfile` links

-	[`0.12`, `0.12.0` (*0.12/Dockerfile*)](https://github.com/influxdata/kapacitor-docker/blob/bbfea78a0a43bd4c6d67e139afb518bac3aa424b/0.12/Dockerfile)
-	[`0.13`, `0.13.1`, `latest` (*kapacitor/0.13/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/22b661b4c141d237669f94e4740f234b7be43a7b/kapacitor/0.13/Dockerfile)
-	[`0.13-alpine`, `0.13.1-alpine`, `alpine` (*kapacitor/0.13/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/22b661b4c141d237669f94e4740f234b7be43a7b/kapacitor/0.13/alpine/Dockerfile)
-	[`1.0.0-rc2` (*kapacitor/1.0/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/269f3d4ee4a91ff8fe05d6a1c71a1e0ced1b900b/kapacitor/1.0/Dockerfile)
-	[`1.0.0-rc2-alpine` (*kapacitor/1.0/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/269f3d4ee4a91ff8fe05d6a1c71a1e0ced1b900b/kapacitor/1.0/alpine/Dockerfile)
+-	[`0.13`, `0.13.1` (*kapacitor/0.13/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/ec08f02c8a4a15bcea2a6c46517eceb9284633a2/kapacitor/0.13/Dockerfile)
+-	[`0.13-alpine`, `0.13.1-alpine` (*kapacitor/0.13/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/ec08f02c8a4a15bcea2a6c46517eceb9284633a2/kapacitor/0.13/alpine/Dockerfile)
+-	[`1.0`, `1.0.1`, `latest` (*kapacitor/1.0/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/d2fb0a4ddcc93a8387aa313a43ff78b0964a379f/kapacitor/1.0/Dockerfile)
+-	[`1.0-alpine`, `1.0.1-alpine`, `alpine` (*kapacitor/1.0/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/d2fb0a4ddcc93a8387aa313a43ff78b0964a379f/kapacitor/1.0/alpine/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/kapacitor`)](https://github.com/docker-library/official-images/blob/master/library/kapacitor). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fkapacitor).

--- a/kibana/README.md
+++ b/kibana/README.md
@ -1,12 +1,11 @@
 # Supported tags and respective `Dockerfile` links

-	[`4.0.3`, `4.0` (*4.0/Dockerfile*)](https://github.com/docker-library/kibana/blob/9fc787378f38bc25616d7118741a74b42402d344/4.0/Dockerfile)
 -	[`4.1.11`, `4.1` (*4.1/Dockerfile*)](https://github.com/docker-library/kibana/blob/7ce21f8aa1e58443c3031fdbdf83a08ce34e49a4/4.1/Dockerfile)
 -	[`4.2.2`, `4.2` (*4.2/Dockerfile*)](https://github.com/docker-library/kibana/blob/9fc787378f38bc25616d7118741a74b42402d344/4.2/Dockerfile)
 -	[`4.3.3`, `4.3` (*4.3/Dockerfile*)](https://github.com/docker-library/kibana/blob/9fc787378f38bc25616d7118741a74b42402d344/4.3/Dockerfile)
 -	[`4.4.2`, `4.4` (*4.4/Dockerfile*)](https://github.com/docker-library/kibana/blob/9fc787378f38bc25616d7118741a74b42402d344/4.4/Dockerfile)
 -	[`4.5.4`, `4.5` (*4.5/Dockerfile*)](https://github.com/docker-library/kibana/blob/7ce21f8aa1e58443c3031fdbdf83a08ce34e49a4/4.5/Dockerfile)
-	[`4.6.0`, `4.6`, `4`, `latest` (*4.6/Dockerfile*)](https://github.com/docker-library/kibana/blob/1873a075ac7df4439de535c6c85b6d3e3467579a/4.6/Dockerfile)
+-	[`4.6.1`, `4.6`, `4`, `latest` (*4.6/Dockerfile*)](https://github.com/docker-library/kibana/blob/e930401355dc9b268b3e7d036794263a8e0f7a82/4.6/Dockerfile)
 -	[`5.0.0-alpha5`, `5.0.0`, `5.0`, `5` (*5.0/Dockerfile*)](https://github.com/docker-library/kibana/blob/f1e01a0c5d64b1eea3c9d90a2cba93d9f3924bd0/5.0/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/kibana`)](https://github.com/docker-library/official-images/blob/master/library/kibana). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fkibana).
--- a/kong/README.md
+++ b/kong/README.md
@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links

-	[`0.9.0`, `latest` (*Dockerfile*)](https://github.com/Mashape/docker-kong/blob/2260a724f914c2155f6b70bf5aa80732ebdf6497/Dockerfile)
+-	[`0.9`, `0.9.2`, `latest` (*Dockerfile*)](https://github.com/Mashape/docker-kong/blob/6360dbcc1122a0243839e2eff3dd1cdbeb15e1d5/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/kong`)](https://github.com/docker-library/official-images/blob/master/library/kong). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fkong).

@ -52,8 +52,10 @@ Once the database is running, we can start a Kong container and link it to the d

 ```shell
 $ docker run -d --name kong \
-    -e "KONG_DATABASE=cassandra" \
    --link kong-database:kong-database \
+    -e "KONG_DATABASE=cassandra" \
+    -e "KONG_CASSANDRA_CONTACT_POINTS=kong-database" \
+    -e "KONG_PG_HOST=kong-database" \
    -p 8000:8000 \
    -p 8443:8443 \
    -p 8001:8001 \
--- a/kong/content.md
+++ b/kong/content.md
@ -44,8 +44,10 @@ Once the database is running, we can start a Kong container and link it to the d

 ```shell
 $ docker run -d --name kong \
-    -e "KONG_DATABASE=cassandra" \
    --link kong-database:kong-database \
+    -e "KONG_DATABASE=cassandra" \
+    -e "KONG_CASSANDRA_CONTACT_POINTS=kong-database" \
+    -e "KONG_PG_HOST=kong-database" \
    -p 8000:8000 \
    -p 8443:8443 \
    -p 8001:8001 \
--- a/lightstreamer/README.md
+++ b/lightstreamer/README.md
@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links

-	[`6.0.2`, `6.0`, `6`, `latest` (*6.0/Dockerfile*)](https://github.com/Lightstreamer/Docker/blob/ac09cec81d3dacc9175371815e42a2b7495473b4/6.0/Dockerfile)
+-	[`6.0.3`, `6.0`, `6`, `latest` (*6.0/Dockerfile*)](https://github.com/Lightstreamer/Docker/blob/784b417d4415e12f1bb1b15f7f697273de3a7ded/6.0/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/lightstreamer`)](https://github.com/docker-library/official-images/blob/master/library/lightstreamer). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Flightstreamer).

--- a/mariadb/README.md
+++ b/mariadb/README.md
@ -1,8 +1,8 @@
 # Supported tags and respective `Dockerfile` links

-	[`10.1.17`, `10.1`, `10`, `latest` (*10.1/Dockerfile*)](https://github.com/docker-library/mariadb/blob/7556dd6530170f6e41126423fd292dae159c272a/10.1/Dockerfile)
+-	[`10.1.18`, `10.1`, `10`, `latest` (*10.1/Dockerfile*)](https://github.com/docker-library/mariadb/blob/5faca097859879a9629312ee1d31fb22a06c6bf3/10.1/Dockerfile)
 -	[`10.0.27`, `10.0` (*10.0/Dockerfile*)](https://github.com/docker-library/mariadb/blob/9d7717c9d7e98619a3b7e7d4337e64b0de7d2f5b/10.0/Dockerfile)
-	[`5.5.51`, `5.5`, `5` (*5.5/Dockerfile*)](https://github.com/docker-library/mariadb/blob/0bcd1e2db0ef04f4abac85e2a759b04231ba60a0/5.5/Dockerfile)
+-	[`5.5.52`, `5.5`, `5` (*5.5/Dockerfile*)](https://github.com/docker-library/mariadb/blob/a0c4133675061dde79d08e13f20e365570acd866/5.5/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/mariadb`)](https://github.com/docker-library/official-images/blob/master/library/mariadb). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fmariadb).

--- a/mongo/README.md
+++ b/mongo/README.md
@ -3,10 +3,10 @@
 -	[`2.6.12`, `2.6`, `2` (*2.6/Dockerfile*)](https://github.com/docker-library/mongo/blob/fc91d681fa5808c30c3118ce7fe3f993beccc82d/2.6/Dockerfile)
 -	[`3.0.12`, `3.0` (*3.0/Dockerfile*)](https://github.com/docker-library/mongo/blob/4b1d085ccab5728a9b9e4b65c5ed19820420809e/3.0/Dockerfile)
 -	[`3.0.12-windowsservercore`, `3.0-windowsservercore` (*3.0/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/89549b2b779421c057b04858477012b7aa17f498/3.0/windows/windowsservercore/Dockerfile)
-	[`3.2.9`, `3.2`, `3`, `latest` (*3.2/Dockerfile*)](https://github.com/docker-library/mongo/blob/4d7bd01562edefad38a240c40a4b162a1cd7b9c2/3.2/Dockerfile)
-	[`3.2.9-windowsservercore`, `3.2-windowsservercore`, `3-windowsservercore`, `windowsservercore` (*3.2/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/89549b2b779421c057b04858477012b7aa17f498/3.2/windows/windowsservercore/Dockerfile)
-	[`3.3.12`, `3.3` (*3.3/Dockerfile*)](https://github.com/docker-library/mongo/blob/174bd96682dc3613df9b670658ac81c9dd17ba74/3.3/Dockerfile)
-	[`3.3.12-windowsservercore`, `3.3-windowsservercore` (*3.3/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/174bd96682dc3613df9b670658ac81c9dd17ba74/3.3/windows/windowsservercore/Dockerfile)
+-	[`3.2.10`, `3.2`, `3`, `latest` (*3.2/Dockerfile*)](https://github.com/docker-library/mongo/blob/368cc7355471feba3071a4e0b7e44edf61401213/3.2/Dockerfile)
+-	[`3.2.10-windowsservercore`, `3.2-windowsservercore`, `3-windowsservercore`, `windowsservercore` (*3.2/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/368cc7355471feba3071a4e0b7e44edf61401213/3.2/windows/windowsservercore/Dockerfile)
+-	[`3.3.15`, `3.3` (*3.3/Dockerfile*)](https://github.com/docker-library/mongo/blob/944c44b6304ab387e4640fddaa808bc93f32b176/3.3/Dockerfile)
+-	[`3.3.15-windowsservercore`, `3.3-windowsservercore` (*3.3/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/944c44b6304ab387e4640fddaa808bc93f32b176/3.3/windows/windowsservercore/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/mongo`)](https://github.com/docker-library/official-images/blob/master/library/mongo). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fmongo).

--- a/mono/README.md
+++ b/mono/README.md
@ -20,8 +20,12 @@
 -	[`4.4.0.182-onbuild`, `4.4.0-onbuild` (*4.4.0.182/onbuild/Dockerfile*)](https://github.com/mono/docker/blob/09ae976880cd497a7dc9e8c89e8f26a8fcbd3879/4.4.0.182/onbuild/Dockerfile)
 -	[`4.4.1.0`, `4.4.1` (*4.4.1.0/Dockerfile*)](https://github.com/mono/docker/blob/4e1d4cc196b612bcbd8466906815bfaef1f1413e/4.4.1.0/Dockerfile)
 -	[`4.4.1.0-onbuild`, `4.4.1-onbuild` (*4.4.1.0/onbuild/Dockerfile*)](https://github.com/mono/docker/blob/dc93f0bbd9eeed6d8e0c89604f12991834a2d871/4.4.1.0/onbuild/Dockerfile)
-	[`4.4.2.11`, `4.4.2`, `4.4`, `4`, `latest` (*4.4.2.11/Dockerfile*)](https://github.com/mono/docker/blob/b2efdab5e0ef9ef0b91930956a7f5049ec0e4146/4.4.2.11/Dockerfile)
-	[`4.4.2.11-onbuild`, `4.4.2-onbuild`, `4.4-onbuild`, `4-onbuild`, `onbuild` (*4.4.2.11/onbuild/Dockerfile*)](https://github.com/mono/docker/blob/b2efdab5e0ef9ef0b91930956a7f5049ec0e4146/4.4.2.11/onbuild/Dockerfile)
+-	[`4.4.2.11`, `4.4.2`, `4.4` (*4.4.2.11/Dockerfile*)](https://github.com/mono/docker/blob/b2efdab5e0ef9ef0b91930956a7f5049ec0e4146/4.4.2.11/Dockerfile)
+-	[`4.4.2.11-onbuild`, `4.4.2-onbuild`, `4.4-onbuild` (*4.4.2.11/onbuild/Dockerfile*)](https://github.com/mono/docker/blob/b2efdab5e0ef9ef0b91930956a7f5049ec0e4146/4.4.2.11/onbuild/Dockerfile)
+-	[`4.6.0.245`, `4.6.0` (*4.6.0.245/Dockerfile*)](https://github.com/mono/docker/blob/9fdd0e79b4eb3e7e7e818fbd58bd324d4c5ab7e1/4.6.0.245/Dockerfile)
+-	[`4.6.0.245-onbuild`, `4.6.0-onbuild` (*4.6.0.245/onbuild/Dockerfile*)](https://github.com/mono/docker/blob/9fdd0e79b4eb3e7e7e818fbd58bd324d4c5ab7e1/4.6.0.245/onbuild/Dockerfile)
+-	[`4.6.1.3`, `4.6.1`, `4.6`, `4`, `latest` (*4.6.1.3/Dockerfile*)](https://github.com/mono/docker/blob/f0f1e0b9f693bd7c58d9623d402c8dc69234bbe1/4.6.1.3/Dockerfile)
+-	[`4.6.1.3-onbuild`, `4.6.1-onbuild`, `4.6-onbuild`, `4-onbuild`, `onbuild` (*4.6.1.3/onbuild/Dockerfile*)](https://github.com/mono/docker/blob/f0f1e0b9f693bd7c58d9623d402c8dc69234bbe1/4.6.1.3/onbuild/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/mono`)](https://github.com/docker-library/official-images/blob/master/library/mono). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fmono).

--- a/mysql/README.md
+++ b/mysql/README.md
@ -1,8 +1,8 @@
 # Supported tags and respective `Dockerfile` links

-	[`5.7.14`, `5.7`, `5`, `latest` (*5.7/Dockerfile*)](https://github.com/docker-library/mysql/blob/dbb83a94ee0a994651dd430d27caeac652cf9e78/5.7/Dockerfile)
-	[`5.6.32`, `5.6` (*5.6/Dockerfile*)](https://github.com/docker-library/mysql/blob/dbb83a94ee0a994651dd430d27caeac652cf9e78/5.6/Dockerfile)
-	[`5.5.51`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/mysql/blob/dbb83a94ee0a994651dd430d27caeac652cf9e78/5.5/Dockerfile)
+-	[`5.7.15`, `5.7`, `5`, `latest` (*5.7/Dockerfile*)](https://github.com/docker-library/mysql/blob/9f95658f528699d2c2017ca42ad163a9d5c5e7c1/5.7/Dockerfile)
+-	[`5.6.33`, `5.6` (*5.6/Dockerfile*)](https://github.com/docker-library/mysql/blob/9fc086343ebd36af0448438622188264d1dc2e1c/5.6/Dockerfile)
+-	[`5.5.52`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/mysql/blob/78c736cef063f6c69256aa34f87ee463949af34f/5.5/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). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fmysql).

--- a/nats-streaming/README-short.txt
+++ b/nats-streaming/README-short.txt
@ -0,0 +1 @@
+NATS Streaming is an open-source, high-performance, cloud native messaging streaming system.
--- a/nats-streaming/README.md
+++ b/nats-streaming/README.md
@ -0,0 +1,158 @@
+# Supported tags and respective `Dockerfile` links
+
+-	[`0.2.2`, `latest` (*Dockerfile*)](https://github.com/nats-io/nats-streaming-docker/blob/d7e21255fec8967f7dbdacdb4501c8e78d821e49/Dockerfile)
+
+For more information about this image and its history, please see [the relevant manifest file (`library/nats-streaming`)](https://github.com/docker-library/official-images/blob/master/library/nats-streaming). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fnats-streaming).
+
+For detailed information about the virtual/transfer sizes and individual layers of each of the above supported tags, please see [the `repos/nats-streaming/tag-details.md` file](https://github.com/docker-library/repo-info/blob/master/repos/nats-streaming/tag-details.md) in [the `docker-library/repo-info` GitHub repo](https://github.com/docker-library/repo-info).
+
+# [NATS Streaming](https://nats.io): A high-performance cloud native messaging streaming system.
+
+![logo](https://raw.githubusercontent.com/docker-library/docs/4a2d30cdf4ff4bc6ae915ada7a058db0c908659d/nats-streaming/logo.png)
+
+`nats-streaming` is a high performance streaming server for the NATS Messaging System.
+
+# Example usage
+
+```bash
+# Run a NATS Streaning server
+# Each server exposes multiple ports
+# 4222 is for clients.
+# 8222 is an HTTP management port for information reporting.
+# use -p or -P as needed.
+
+$ docker run -d nats-streaming
+
+Output that you would get if you had started with `-ti` instead of `d` (for daemon):
+
+[INF] Starting nats-streaming-server[test-cluster] version 0.2.2
+[INF] Starting nats-server version 0.9.2
+[INF] Starting http monitor on :8222
+[INF] Listening for client connections on 0.0.0.0:4222
+[INF] Server is ready
+[INF] STAN: Message store is MEMORY
+[INF] STAN: Maximum of 1000000 will be stored
+
+To use a file based store instead, you would run:
+
+$ docker run -d nats-streaming -store file -dir datastore
+
+[INF] Starting nats-streaming-server[test-cluster] version 0.2.2
+[INF] Starting nats-server version 0.9.2
+[INF] Starting http monitor on :8222
+[INF] Listening for client connections on 0.0.0.0:4222
+[INF] Server is ready
+[INF] STAN: Message store is FILE
+[INF] STAN: Maximum of 1000000 will be stored
+
+You can also connect to a remote NATS Server running in a docker image.
+First, run NATS Server:
+
+$ docker run -d --name=nats-main nats
+
+Now, start the Streaming server and link it to the above docker image:
+
+$ docker run -d --link nats-main nats-streaming -ns nats://nats-main:4222 
+
+[INF] Starting nats-streaming-server[test-cluster] version 0.2.2
+[INF] STAN: Message store is MEMORY
+[INF] STAN: Maximum of 1000000 will be stored
+
+Notice that the output shows that the NATS Server was not started, as opposed to the first output.
+
+```
+
+# Commandline Options
+
+```bash
+Streaming Server Options:
+    -cid, --cluster_id  <cluster ID> Cluster ID (default: test-cluster)
+    -st,  --store <type>             Store type: MEMORY|FILE (default: MEMORY)
+          --dir <directory>          For FILE store type, this is the root directory
+    -mc,  --max_channels <number>    Max number of channels (aka subjects, topics, etc...)
+    -msu, --max_subs <number>        Max number of subscriptions per channel
+    -mm,  --max_msgs <number>        Max number of messages per channel
+    -mb,  --max_bytes <number>       Max messages total size per channel
+    -ns,  --nats_server <url>        Connect to this external NATS Server (embedded otherwise)
+
+Streaming Server TLS Options:
+    -secure                          Use a TLS connection to the NATS server without
+                                     verification; weaker than specifying certificates.
+    -tls_client_key                  Client key for the streaming server
+    -tls_client_cert                 Client certificate for the streaming server
+    -tls_client_cacert               Client certificate CA for the streaming server
+
+Streaming Server Logging Options:
+    -SD, --stan_debug                Enable STAN debugging output
+    -SV, --stan_trace                Trace the raw STAN protocol
+    -SDV                             Debug and trace STAN
+    (See additional NATS logging options below)
+
+Embedded NATS Server Options:
+    -a, --addr <host>                Bind to host address (default: 0.0.0.0)
+    -p, --port <port>                Use port for clients (default: 4222)
+    -P, --pid <file>                 File to store PID
+    -m, --http_port <port>           Use port for http monitoring
+    -ms,--https_port <port>          Use port for https monitoring
+    -c, --config <file>              Configuration file
+
+Logging Options:
+    -l, --log <file>                 File to redirect log output
+    -T, --logtime                    Timestamp log entries (default: true)
+    -s, --syslog                     Enable syslog as log method
+    -r, --remote_syslog <addr>       Syslog server addr (udp://localhost:514)
+    -D, --debug                      Enable debugging output
+    -V, --trace                      Trace the raw protocol
+    -DV                              Debug and trace
+
+Authorization Options:
+        --user <user>                User required for connections
+        --pass <password>            Password required for connections
+        --auth <token>               Authorization token required for connections
+
+TLS Options:
+        --tls                        Enable TLS, do not verify clients (default: false)
+        --tlscert <file>             Server certificate file
+        --tlskey <file>              Private key for server certificate
+        --tlsverify                  Enable TLS, very client certificates
+        --tlscacert <file>           Client certificate CA for verification
+
+NATS Clustering Options:
+        --routes <rurl-1, rurl-2>    Routes to solicit and connect
+        --cluster <cluster-url>      Cluster URL for solicited routes
+
+Common Options:
+    -h, --help                       Show this message
+    -v, --version                    Show version
+        --help_tls                   TLS help.
+```
+
+# License
+
+View [license information](https://github.com/nats-io/nats-streaming-server/blob/master/LICENSE) for the software contained in this image.
+
+# Supported Docker versions
+
+This image is officially supported on Docker version 1.12.1.
+
+Support for older versions (down to 1.6) is provided on a best-effort basis.
+
+Please see [the Docker installation documentation](https://docs.docker.com/installation/) for details on how to upgrade your Docker daemon.
+
+# User Feedback
+
+## Documentation
+
+Documentation for this image is stored in the [`nats-streaming/` directory](https://github.com/docker-library/docs/tree/master/nats-streaming) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
+
+## Issues
+
+If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/nats-io/nats-streaming-docker/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
+
+You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
+
+## Contributing
+
+You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
+
+Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/nats-io/nats-streaming-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
--- a/nats-streaming/content.md
+++ b/nats-streaming/content.md
@ -0,0 +1,120 @@
+# [NATS Streaming](https://nats.io): A high-performance cloud native messaging streaming system.
+
+%%LOGO%%
+
+`nats-streaming` is a high performance streaming server for the NATS Messaging System.
+
+# Example usage
+
+```bash
+# Run a NATS Streaning server
+# Each server exposes multiple ports
+# 4222 is for clients.
+# 8222 is an HTTP management port for information reporting.
+# use -p or -P as needed.
+
+$ docker run -d nats-streaming
+
+Output that you would get if you had started with `-ti` instead of `d` (for daemon):
+
+[INF] Starting nats-streaming-server[test-cluster] version 0.2.2
+[INF] Starting nats-server version 0.9.2
+[INF] Starting http monitor on :8222
+[INF] Listening for client connections on 0.0.0.0:4222
+[INF] Server is ready
+[INF] STAN: Message store is MEMORY
+[INF] STAN: Maximum of 1000000 will be stored
+
+To use a file based store instead, you would run:
+
+$ docker run -d nats-streaming -store file -dir datastore
+
+[INF] Starting nats-streaming-server[test-cluster] version 0.2.2
+[INF] Starting nats-server version 0.9.2
+[INF] Starting http monitor on :8222
+[INF] Listening for client connections on 0.0.0.0:4222
+[INF] Server is ready
+[INF] STAN: Message store is FILE
+[INF] STAN: Maximum of 1000000 will be stored
+
+You can also connect to a remote NATS Server running in a docker image.
+First, run NATS Server:
+
+$ docker run -d --name=nats-main nats
+
+Now, start the Streaming server and link it to the above docker image:
+
+$ docker run -d --link nats-main nats-streaming -ns nats://nats-main:4222 
+
+[INF] Starting nats-streaming-server[test-cluster] version 0.2.2
+[INF] STAN: Message store is MEMORY
+[INF] STAN: Maximum of 1000000 will be stored
+
+Notice that the output shows that the NATS Server was not started, as opposed to the first output.
+
+```
+
+# Commandline Options
+
+```bash
+Streaming Server Options:
+    -cid, --cluster_id  <cluster ID> Cluster ID (default: test-cluster)
+    -st,  --store <type>             Store type: MEMORY|FILE (default: MEMORY)
+          --dir <directory>          For FILE store type, this is the root directory
+    -mc,  --max_channels <number>    Max number of channels (aka subjects, topics, etc...)
+    -msu, --max_subs <number>        Max number of subscriptions per channel
+    -mm,  --max_msgs <number>        Max number of messages per channel
+    -mb,  --max_bytes <number>       Max messages total size per channel
+    -ns,  --nats_server <url>        Connect to this external NATS Server (embedded otherwise)
+
+Streaming Server TLS Options:
+    -secure                          Use a TLS connection to the NATS server without
+                                     verification; weaker than specifying certificates.
+    -tls_client_key                  Client key for the streaming server
+    -tls_client_cert                 Client certificate for the streaming server
+    -tls_client_cacert               Client certificate CA for the streaming server
+
+Streaming Server Logging Options:
+    -SD, --stan_debug                Enable STAN debugging output
+    -SV, --stan_trace                Trace the raw STAN protocol
+    -SDV                             Debug and trace STAN
+    (See additional NATS logging options below)
+
+Embedded NATS Server Options:
+    -a, --addr <host>                Bind to host address (default: 0.0.0.0)
+    -p, --port <port>                Use port for clients (default: 4222)
+    -P, --pid <file>                 File to store PID
+    -m, --http_port <port>           Use port for http monitoring
+    -ms,--https_port <port>          Use port for https monitoring
+    -c, --config <file>              Configuration file
+
+Logging Options:
+    -l, --log <file>                 File to redirect log output
+    -T, --logtime                    Timestamp log entries (default: true)
+    -s, --syslog                     Enable syslog as log method
+    -r, --remote_syslog <addr>       Syslog server addr (udp://localhost:514)
+    -D, --debug                      Enable debugging output
+    -V, --trace                      Trace the raw protocol
+    -DV                              Debug and trace
+
+Authorization Options:
+        --user <user>                User required for connections
+        --pass <password>            Password required for connections
+        --auth <token>               Authorization token required for connections
+
+TLS Options:
+        --tls                        Enable TLS, do not verify clients (default: false)
+        --tlscert <file>             Server certificate file
+        --tlskey <file>              Private key for server certificate
+        --tlsverify                  Enable TLS, very client certificates
+        --tlscacert <file>           Client certificate CA for verification
+
+NATS Clustering Options:
+        --routes <rurl-1, rurl-2>    Routes to solicit and connect
+        --cluster <cluster-url>      Cluster URL for solicited routes
+
+Common Options:
+    -h, --help                       Show this message
+    -v, --version                    Show version
+        --help_tls                   TLS help.
+```
--- a/nats-streaming/github-repo
+++ b/nats-streaming/github-repo
@ -0,0 +1 @@
+https://github.com/nats-io/nats-streaming-docker
--- a/nats-streaming/license.md
+++ b/nats-streaming/license.md
@ -0,0 +1 @@
+View [license information](https://github.com/nats-io/nats-streaming-server/blob/master/LICENSE) for the software contained in this image.
--- a/nats-streaming/logo.png
+++ b/nats-streaming/logo.png
--- a/neo4j/README.md
+++ b/neo4j/README.md
@ -1,7 +1,11 @@
 # Supported tags and respective `Dockerfile` links

-	[`3.0.4`, `3.0`, `latest` (*3.0.4/community/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/1ad894c32a9cf2a7147f4bdd76eb7a52f8df9d12/3.0.4/community/Dockerfile)
-	[`3.0.4-enterprise`, `3.0-enterprise`, `enterprise` (*3.0.4/enterprise/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/1ad894c32a9cf2a7147f4bdd76eb7a52f8df9d12/3.0.4/enterprise/Dockerfile)
+-	[`3.0.6`, `3.0`, `latest` (*3.0.6/community/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/22114d5022d6bd414fc7d34046b7a5f9cfdc930c/3.0.6/community/Dockerfile)
+-	[`3.0.6-enterprise`, `3.0-enterprise`, `enterprise` (*3.0.6/enterprise/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/22114d5022d6bd414fc7d34046b7a5f9cfdc930c/3.0.6/enterprise/Dockerfile)
+-	[`3.0.5` (*3.0.5/community/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/22114d5022d6bd414fc7d34046b7a5f9cfdc930c/3.0.5/community/Dockerfile)
+-	[`3.0.5-enterprise` (*3.0.5/enterprise/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/22114d5022d6bd414fc7d34046b7a5f9cfdc930c/3.0.5/enterprise/Dockerfile)
+-	[`3.0.4` (*3.0.4/community/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/1ad894c32a9cf2a7147f4bdd76eb7a52f8df9d12/3.0.4/community/Dockerfile)
+-	[`3.0.4-enterprise` (*3.0.4/enterprise/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/1ad894c32a9cf2a7147f4bdd76eb7a52f8df9d12/3.0.4/enterprise/Dockerfile)
 -	[`3.0.3` (*3.0.3/community/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/e93e47d841dbcd93793c44c393195803ba60b16f/3.0.3/community/Dockerfile)
 -	[`3.0.3-enterprise` (*3.0.3/enterprise/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/e93e47d841dbcd93793c44c393195803ba60b16f/3.0.3/enterprise/Dockerfile)
 -	[`3.0.2` (*3.0.2/community/Dockerfile*)](https://github.com/neo4j/docker-neo4j-publish/blob/e93e47d841dbcd93793c44c393195803ba60b16f/3.0.2/community/Dockerfile)
@ -56,7 +60,7 @@ By default, this requires you to login with `neo4j/neo4j` and change the passwor

 ## Note on version 2.3

-Neo4j 3.0 introduced several major user-facing changes, primarily the new binary Bolt protocol. This is not available in 2.3 and as such, there is no need to expose the `7687` port. Due to changes made to the structure of configuration files, several environment variables used to configure the image has changed as well. Please see the [2.x specific section in the manual](http://neo4j.com/developer/docker-2.x/) for further details.
+Neo4j 3.0 introduced several major user-facing changes, primarily the new binary Bolt protocol. This is not available in 2.3 and as such, there is no need to expose the `7687` port. Due to changes made to the structure of configuration files, several environment variables used to configure the image has changed as well. Please see the [2.x specific section in the manual](http://neo4j.com/developer/docker-23/) for further details.

 You can start an instance of Neo4j 2.3 like this:

@ -69,7 +73,7 @@ docker run \

 # Documentation

-For more examples and complete documentation please go [here for 2.x](http://neo4j.com/developer/docker-2.x/) and [here for 3.x](http://neo4j.com/developer/docker-3.x/).
+For more examples and complete documentation please go [here for 2.x](http://neo4j.com/developer/docker-23/) and [here for 3.x](http://neo4j.com/docs/operations-manual/current/deployment/single-instance/docker/).

 # Supported Docker versions

--- a/neo4j/content.md
+++ b/neo4j/content.md
@ -25,7 +25,7 @@ By default, this requires you to login with `neo4j/neo4j` and change the passwor

 ## Note on version 2.3

-Neo4j 3.0 introduced several major user-facing changes, primarily the new binary Bolt protocol. This is not available in 2.3 and as such, there is no need to expose the `7687` port. Due to changes made to the structure of configuration files, several environment variables used to configure the image has changed as well. Please see the [2.x specific section in the manual](http://neo4j.com/developer/docker-2.x/) for further details.
+Neo4j 3.0 introduced several major user-facing changes, primarily the new binary Bolt protocol. This is not available in 2.3 and as such, there is no need to expose the `7687` port. Due to changes made to the structure of configuration files, several environment variables used to configure the image has changed as well. Please see the [2.x specific section in the manual](http://neo4j.com/developer/docker-23/) for further details.

 You can start an instance of Neo4j 2.3 like this:

@ -38,4 +38,4 @@ docker run \

 # Documentation

-For more examples and complete documentation please go [here for 2.x](http://neo4j.com/developer/docker-2.x/) and [here for 3.x](http://neo4j.com/developer/docker-3.x/).
+For more examples and complete documentation please go [here for 2.x](http://neo4j.com/developer/docker-23/) and [here for 3.x](http://neo4j.com/docs/operations-manual/current/deployment/single-instance/docker/).
--- a/nginx/README.md
+++ b/nginx/README.md
@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links

-	[`1.11.3`, `mainline`, `1`, `1.11`, `latest` (*mainline/jessie/Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/1f7e3c6473c2c6211c305d85cdfcfd733fe1b348/mainline/jessie/Dockerfile)
-	[`1.11.3-alpine`, `mainline-alpine`, `1-alpine`, `1.11-alpine`, `alpine` (*mainline/alpine/Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/e117bd83e9befe5582bc1da8f72248398fffa16c/mainline/alpine/Dockerfile)
+-	[`1.11.4`, `mainline`, `1`, `1.11`, `latest` (*mainline/jessie/Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/0dd9ef6a337474293b5e36c95a85da99b11e1a0a/mainline/jessie/Dockerfile)
+-	[`1.11.4-alpine`, `mainline-alpine`, `1-alpine`, `1.11-alpine`, `alpine` (*mainline/alpine/Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/0dd9ef6a337474293b5e36c95a85da99b11e1a0a/mainline/alpine/Dockerfile)
 -	[`1.10.1`, `stable`, `1.10` (*stable/jessie/Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/11fc019b2be3ad51ba5d097b1857a099c4056213/stable/jessie/Dockerfile)
 -	[`1.10.1-alpine`, `stable-alpine`, `1.10-alpine` (*stable/alpine/Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/e117bd83e9befe5582bc1da8f72248398fffa16c/stable/alpine/Dockerfile)

--- a/node/README.md
+++ b/node/README.md
@ -1,25 +1,21 @@
 # Supported tags and respective `Dockerfile` links

-	[`0.10.46`, `0.10` (*0.10/Dockerfile*)](https://github.com/nodejs/docker-node/blob/5ad063e3ba340743e394114d3038d0fd4e0fe570/0.10/Dockerfile)
-	[`0.10.46-onbuild`, `0.10-onbuild` (*0.10/onbuild/Dockerfile*)](https://github.com/nodejs/docker-node/blob/50b56d39a236fd519eda2231757aa2173e270807/0.10/onbuild/Dockerfile)
-	[`0.10.46-slim`, `0.10-slim` (*0.10/slim/Dockerfile*)](https://github.com/nodejs/docker-node/blob/5ad063e3ba340743e394114d3038d0fd4e0fe570/0.10/slim/Dockerfile)
-	[`0.10.46-wheezy`, `0.10-wheezy` (*0.10/wheezy/Dockerfile*)](https://github.com/nodejs/docker-node/blob/5ad063e3ba340743e394114d3038d0fd4e0fe570/0.10/wheezy/Dockerfile)
-	[`0.12.15`, `0.12`, `0` (*0.12/Dockerfile*)](https://github.com/nodejs/docker-node/blob/5ad063e3ba340743e394114d3038d0fd4e0fe570/0.12/Dockerfile)
-	[`0.12.15-onbuild`, `0.12-onbuild`, `0-onbuild` (*0.12/onbuild/Dockerfile*)](https://github.com/nodejs/docker-node/blob/50b56d39a236fd519eda2231757aa2173e270807/0.12/onbuild/Dockerfile)
-	[`0.12.15-slim`, `0.12-slim`, `0-slim` (*0.12/slim/Dockerfile*)](https://github.com/nodejs/docker-node/blob/5ad063e3ba340743e394114d3038d0fd4e0fe570/0.12/slim/Dockerfile)
-	[`0.12.15-wheezy`, `0.12-wheezy`, `0-wheezy` (*0.12/wheezy/Dockerfile*)](https://github.com/nodejs/docker-node/blob/5ad063e3ba340743e394114d3038d0fd4e0fe570/0.12/wheezy/Dockerfile)
-	[`4.5.0`, `4.5`, `4`, `argon` (*4.5/Dockerfile*)](https://github.com/nodejs/docker-node/blob/5ad063e3ba340743e394114d3038d0fd4e0fe570/4.5/Dockerfile)
-	[`4.5.0-onbuild`, `4.5-onbuild`, `4-onbuild`, `argon-onbuild` (*4.5/onbuild/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4ad33b57b2fa9d9bfc92e2369b14adb42e1eb90c/4.5/onbuild/Dockerfile)
-	[`4.5.0-slim`, `4.5-slim`, `4-slim`, `argon-slim` (*4.5/slim/Dockerfile*)](https://github.com/nodejs/docker-node/blob/5ad063e3ba340743e394114d3038d0fd4e0fe570/4.5/slim/Dockerfile)
-	[`4.5.0-wheezy`, `4.5-wheezy`, `4-wheezy`, `argon-wheezy` (*4.5/wheezy/Dockerfile*)](https://github.com/nodejs/docker-node/blob/5ad063e3ba340743e394114d3038d0fd4e0fe570/4.5/wheezy/Dockerfile)
-	[`5.12.0`, `5.12`, `5` (*5.12/Dockerfile*)](https://github.com/nodejs/docker-node/blob/5ad063e3ba340743e394114d3038d0fd4e0fe570/5.12/Dockerfile)
-	[`5.12.0-onbuild`, `5.12-onbuild`, `5-onbuild` (*5.12/onbuild/Dockerfile*)](https://github.com/nodejs/docker-node/blob/50b56d39a236fd519eda2231757aa2173e270807/5.12/onbuild/Dockerfile)
-	[`5.12.0-slim`, `5.12-slim`, `5-slim` (*5.12/slim/Dockerfile*)](https://github.com/nodejs/docker-node/blob/5ad063e3ba340743e394114d3038d0fd4e0fe570/5.12/slim/Dockerfile)
-	[`5.12.0-wheezy`, `5.12-wheezy`, `5-wheezy` (*5.12/wheezy/Dockerfile*)](https://github.com/nodejs/docker-node/blob/5ad063e3ba340743e394114d3038d0fd4e0fe570/5.12/wheezy/Dockerfile)
-	[`6.5.0`, `6.5`, `6`, `latest` (*6.5/Dockerfile*)](https://github.com/nodejs/docker-node/blob/910443c39c80291f0bf24712d8d94279cf15b7b5/6.5/Dockerfile)
-	[`6.5.0-onbuild`, `6.5-onbuild`, `6-onbuild`, `onbuild` (*6.5/onbuild/Dockerfile*)](https://github.com/nodejs/docker-node/blob/910443c39c80291f0bf24712d8d94279cf15b7b5/6.5/onbuild/Dockerfile)
-	[`6.5.0-slim`, `6.5-slim`, `6-slim`, `slim` (*6.5/slim/Dockerfile*)](https://github.com/nodejs/docker-node/blob/910443c39c80291f0bf24712d8d94279cf15b7b5/6.5/slim/Dockerfile)
-	[`6.5.0-wheezy`, `6.5-wheezy`, `6-wheezy`, `wheezy` (*6.5/wheezy/Dockerfile*)](https://github.com/nodejs/docker-node/blob/910443c39c80291f0bf24712d8d94279cf15b7b5/6.5/wheezy/Dockerfile)
+-	[`6.7.0`, `6.7`, `6`, `latest` (*6.7/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/6.7/Dockerfile)
+-	[`6.7.0-onbuild`, `6.7-onbuild`, `6-onbuild`, `onbuild` (*6.7/onbuild/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/6.7/onbuild/Dockerfile)
+-	[`6.7.0-slim`, `6.7-slim`, `6-slim`, `slim` (*6.7/slim/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/6.7/slim/Dockerfile)
+-	[`6.7.0-wheezy`, `6.7-wheezy`, `6-wheezy`, `wheezy` (*6.7/wheezy/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/6.7/wheezy/Dockerfile)
+-	[`4.6.0`, `4.6`, `4`, `argon` (*4.6/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/4.6/Dockerfile)
+-	[`4.6.0-onbuild`, `4.6-onbuild`, `4-onbuild`, `argon-onbuild` (*4.6/onbuild/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/4.6/onbuild/Dockerfile)
+-	[`4.6.0-slim`, `4.6-slim`, `4-slim`, `argon-slim` (*4.6/slim/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/4.6/slim/Dockerfile)
+-	[`4.6.0-wheezy`, `4.6-wheezy`, `4-wheezy`, `argon-wheezy` (*4.6/wheezy/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/4.6/wheezy/Dockerfile)
+-	[`0.12.16`, `0.12`, `0` (*0.12/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/0.12/Dockerfile)
+-	[`0.12.16-onbuild`, `0.12-onbuild`, `0-onbuild` (*0.12/onbuild/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/0.12/onbuild/Dockerfile)
+-	[`0.12.16-slim`, `0.12-slim`, `0-slim` (*0.12/slim/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/0.12/slim/Dockerfile)
+-	[`0.12.16-wheezy`, `0.12-wheezy`, `0-wheezy` (*0.12/wheezy/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/0.12/wheezy/Dockerfile)
+-	[`0.10.47`, `0.10` (*0.10/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/0.10/Dockerfile)
+-	[`0.10.47-onbuild`, `0.10-onbuild` (*0.10/onbuild/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/0.10/onbuild/Dockerfile)
+-	[`0.10.47-slim`, `0.10-slim` (*0.10/slim/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/0.10/slim/Dockerfile)
+-	[`0.10.47-wheezy`, `0.10-wheezy` (*0.10/wheezy/Dockerfile*)](https://github.com/nodejs/docker-node/blob/4029a8f71920e1e23efa79602167014f9c325ba0/0.10/wheezy/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/node`)](https://github.com/docker-library/official-images/blob/master/library/node). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fnode).

--- a/openjdk/README.md
+++ b/openjdk/README.md
@ -10,8 +10,8 @@
 -	[`8u92-jdk-alpine`, `8u92-alpine`, `8-jdk-alpine`, `8-alpine`, `jdk-alpine`, `alpine` (*8-jdk/alpine/Dockerfile*)](https://github.com/docker-library/openjdk/blob/54c64cf47d2b705418feb68b811419a223c5a040/8-jdk/alpine/Dockerfile)
 -	[`8u102-jre`, `8-jre`, `jre` (*8-jre/Dockerfile*)](https://github.com/docker-library/openjdk/blob/baaaf7714f9c66e4c5decf2c108a2738b7186c7f/8-jre/Dockerfile)
 -	[`8u92-jre-alpine`, `8-jre-alpine`, `jre-alpine` (*8-jre/alpine/Dockerfile*)](https://github.com/docker-library/openjdk/blob/54c64cf47d2b705418feb68b811419a223c5a040/8-jre/alpine/Dockerfile)
-	[`9-b133-jdk`, `9-b133`, `9-jdk`, `9` (*9-jdk/Dockerfile*)](https://github.com/docker-library/openjdk/blob/2a8c028a7246cd03a96c7cc8f41c4087303c642d/9-jdk/Dockerfile)
-	[`9-b133-jre`, `9-jre` (*9-jre/Dockerfile*)](https://github.com/docker-library/openjdk/blob/2a8c028a7246cd03a96c7cc8f41c4087303c642d/9-jre/Dockerfile)
+-	[`9-b136-jdk`, `9-b136`, `9-jdk`, `9` (*9-jdk/Dockerfile*)](https://github.com/docker-library/openjdk/blob/2ff433f60dd918bd852442dbb4f7b24a148c2fb0/9-jdk/Dockerfile)
+-	[`9-b136-jre`, `9-jre` (*9-jre/Dockerfile*)](https://github.com/docker-library/openjdk/blob/2ff433f60dd918bd852442dbb4f7b24a148c2fb0/9-jre/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/openjdk`)](https://github.com/docker-library/official-images/blob/master/library/openjdk). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fopenjdk).

--- a/oraclelinux/README.md
+++ b/oraclelinux/README.md
@ -1,12 +1,12 @@
 # Supported tags and respective `Dockerfile` links

-	[`latest`, `7`, `7.2` (*OracleLinux/7.2/Dockerfile*)](https://github.com/oracle/docker-images/blob/a44844fe085a561ded44865eafb63f742e4250c1/OracleLinux/7.2/Dockerfile)
-	[`7.1` (*OracleLinux/7.1/Dockerfile*)](https://github.com/oracle/docker-images/blob/a44844fe085a561ded44865eafb63f742e4250c1/OracleLinux/7.1/Dockerfile)
-	[`7.0` (*OracleLinux/7.0/Dockerfile*)](https://github.com/oracle/docker-images/blob/a44844fe085a561ded44865eafb63f742e4250c1/OracleLinux/7.0/Dockerfile)
-	[`6`, `6.8` (*OracleLinux/6.8/Dockerfile*)](https://github.com/oracle/docker-images/blob/a44844fe085a561ded44865eafb63f742e4250c1/OracleLinux/6.8/Dockerfile)
-	[`6.7` (*OracleLinux/6.7/Dockerfile*)](https://github.com/oracle/docker-images/blob/a44844fe085a561ded44865eafb63f742e4250c1/OracleLinux/6.7/Dockerfile)
-	[`6.6` (*OracleLinux/6.6/Dockerfile*)](https://github.com/oracle/docker-images/blob/a44844fe085a561ded44865eafb63f742e4250c1/OracleLinux/6.6/Dockerfile)
-	[`5`, `5.11` (*OracleLinux/5.11/Dockerfile*)](https://github.com/oracle/docker-images/blob/a44844fe085a561ded44865eafb63f742e4250c1/OracleLinux/5.11/Dockerfile)
+-	[`latest`, `7`, `7.2` (*OracleLinux/7.2/Dockerfile*)](https://github.com/oracle/docker-images/blob/a85e4256ce131ed5522f4cd56967401119efad08/OracleLinux/7.2/Dockerfile)
+-	[`7.1` (*OracleLinux/7.1/Dockerfile*)](https://github.com/oracle/docker-images/blob/a85e4256ce131ed5522f4cd56967401119efad08/OracleLinux/7.1/Dockerfile)
+-	[`7.0` (*OracleLinux/7.0/Dockerfile*)](https://github.com/oracle/docker-images/blob/a85e4256ce131ed5522f4cd56967401119efad08/OracleLinux/7.0/Dockerfile)
+-	[`6`, `6.8` (*OracleLinux/6.8/Dockerfile*)](https://github.com/oracle/docker-images/blob/a85e4256ce131ed5522f4cd56967401119efad08/OracleLinux/6.8/Dockerfile)
+-	[`6.7` (*OracleLinux/6.7/Dockerfile*)](https://github.com/oracle/docker-images/blob/a85e4256ce131ed5522f4cd56967401119efad08/OracleLinux/6.7/Dockerfile)
+-	[`6.6` (*OracleLinux/6.6/Dockerfile*)](https://github.com/oracle/docker-images/blob/a85e4256ce131ed5522f4cd56967401119efad08/OracleLinux/6.6/Dockerfile)
+-	[`5`, `5.11` (*OracleLinux/5.11/Dockerfile*)](https://github.com/oracle/docker-images/blob/a85e4256ce131ed5522f4cd56967401119efad08/OracleLinux/5.11/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/oraclelinux`)](https://github.com/docker-library/official-images/blob/master/library/oraclelinux). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Foraclelinux).

--- a/orientdb/README.md
+++ b/orientdb/README.md
@ -1,8 +1,8 @@
 # Supported tags and respective `Dockerfile` links

 -	[`2.0.18` (*2.0/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/a43637b03a105ceb1104cbf5e42e93e1ffed0944/2.0/Dockerfile)
-	[`2.1.22` (*2.1/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/56fffddb4d4181a24c764cf3908b0411e3b92794/2.1/Dockerfile)
-	[`2.2.8`, `latest` (*2.2/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/56fffddb4d4181a24c764cf3908b0411e3b92794/2.2/Dockerfile)
+-	[`2.1.23` (*2.1/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/37b0a2405c4f6d011a5e8fa4f1e42c9b77f45f28/2.1/Dockerfile)
+-	[`2.2.11`, `latest` (*2.2/Dockerfile*)](https://github.com/orientechnologies/orientdb-docker/blob/11a5e240390265e4138fb18c52eec3ba603ff229/2.2/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/orientdb`)](https://github.com/docker-library/official-images/blob/master/library/orientdb). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Forientdb).

--- a/owncloud/README.md
+++ b/owncloud/README.md
@ -1,15 +1,15 @@
 # Supported tags and respective `Dockerfile` links

-	[`8.0.14-apache`, `8.0-apache`, `8.0.14`, `8.0` (*8.0/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/94143a2da24c5f5ca90fede12cd5bb1aa5dc1f1a/8.0/apache/Dockerfile)
-	[`8.0.14-fpm`, `8.0-fpm` (*8.0/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/94143a2da24c5f5ca90fede12cd5bb1aa5dc1f1a/8.0/fpm/Dockerfile)
-	[`8.1.9-apache`, `8.1-apache`, `8.1.9`, `8.1` (*8.1/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/94143a2da24c5f5ca90fede12cd5bb1aa5dc1f1a/8.1/apache/Dockerfile)
-	[`8.1.9-fpm`, `8.1-fpm` (*8.1/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/94143a2da24c5f5ca90fede12cd5bb1aa5dc1f1a/8.1/fpm/Dockerfile)
-	[`8.2.7-apache`, `8.2-apache`, `8-apache`, `8.2.7`, `8.2`, `8` (*8.2/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/94143a2da24c5f5ca90fede12cd5bb1aa5dc1f1a/8.2/apache/Dockerfile)
-	[`8.2.7-fpm`, `8.2-fpm`, `8-fpm` (*8.2/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/94143a2da24c5f5ca90fede12cd5bb1aa5dc1f1a/8.2/fpm/Dockerfile)
-	[`9.0.4-apache`, `9.0-apache`, `9.0.4`, `9.0` (*9.0/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/94143a2da24c5f5ca90fede12cd5bb1aa5dc1f1a/9.0/apache/Dockerfile)
-	[`9.0.4-fpm`, `9.0-fpm` (*9.0/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/94143a2da24c5f5ca90fede12cd5bb1aa5dc1f1a/9.0/fpm/Dockerfile)
-	[`9.1.0-apache`, `9.1-apache`, `9-apache`, `apache`, `9.1.0`, `9.1`, `9`, `latest` (*9.1/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/6011c09fec9dea07faae2282bdeba541a5b77a53/9.1/apache/Dockerfile)
-	[`9.1.0-fpm`, `9.1-fpm`, `9-fpm`, `fpm` (*9.1/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/6011c09fec9dea07faae2282bdeba541a5b77a53/9.1/fpm/Dockerfile)
+-	[`8.0.15-apache`, `8.0-apache`, `8.0.15`, `8.0` (*8.0/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/12b61400b292cfdef89ae568f726798f197ec409/8.0/apache/Dockerfile)
+-	[`8.0.15-fpm`, `8.0-fpm` (*8.0/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/12b61400b292cfdef89ae568f726798f197ec409/8.0/fpm/Dockerfile)
+-	[`8.1.10-apache`, `8.1-apache`, `8.1.10`, `8.1` (*8.1/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/066a4f1d22f703605b00d70178dd7bb71b7d7140/8.1/apache/Dockerfile)
+-	[`8.1.10-fpm`, `8.1-fpm` (*8.1/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/066a4f1d22f703605b00d70178dd7bb71b7d7140/8.1/fpm/Dockerfile)
+-	[`8.2.8-apache`, `8.2-apache`, `8-apache`, `8.2.8`, `8.2`, `8` (*8.2/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/f73b5dc1306f54c0744ad3dce726cbd7fb0530a7/8.2/apache/Dockerfile)
+-	[`8.2.8-fpm`, `8.2-fpm`, `8-fpm` (*8.2/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/f73b5dc1306f54c0744ad3dce726cbd7fb0530a7/8.2/fpm/Dockerfile)
+-	[`9.0.5-apache`, `9.0-apache`, `9.0.5`, `9.0` (*9.0/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/92727b0d210b489161340f740b3693eb87915e16/9.0/apache/Dockerfile)
+-	[`9.0.5-fpm`, `9.0-fpm` (*9.0/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/92727b0d210b489161340f740b3693eb87915e16/9.0/fpm/Dockerfile)
+-	[`9.1.1-apache`, `9.1-apache`, `9-apache`, `apache`, `9.1.1`, `9.1`, `9`, `latest` (*9.1/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/51ba952ab82bdc0755275d31fc288af39ac1ba74/9.1/apache/Dockerfile)
+-	[`9.1.1-fpm`, `9.1-fpm`, `9-fpm`, `fpm` (*9.1/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/51ba952ab82bdc0755275d31fc288af39ac1ba74/9.1/fpm/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/owncloud`)](https://github.com/docker-library/official-images/blob/master/library/owncloud). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fowncloud).

--- a/percona/README.md
+++ b/percona/README.md
@ -1,8 +1,8 @@
 # Supported tags and respective `Dockerfile` links

-	[`5.7.14`, `5.7`, `5`, `latest` (*5.7/Dockerfile*)](https://github.com/docker-library/percona/blob/c44a378d50a1d58f58c202c9a0f59f434fdd72b0/5.7/Dockerfile)
-	[`5.6.32`, `5.6` (*5.6/Dockerfile*)](https://github.com/docker-library/percona/blob/10541a9b50359dfe9c8ea59165adecf3a97b8760/5.6/Dockerfile)
-	[`5.5.51`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/percona/blob/10541a9b50359dfe9c8ea59165adecf3a97b8760/5.5/Dockerfile)
+-	[`5.7.14`, `5.7`, `5`, `latest` (*5.7/Dockerfile*)](https://github.com/docker-library/percona/blob/8f69178d3e8ee9b85eeb92f2b404236ffe1f6a0c/5.7/Dockerfile)
+-	[`5.6.32`, `5.6` (*5.6/Dockerfile*)](https://github.com/docker-library/percona/blob/f8979af93c4ba4d9646cad026909d5f2691fceec/5.6/Dockerfile)
+-	[`5.5.51`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/percona/blob/5bf6984507572e1c26ff9466940797c3e40973ba/5.5/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/percona`)](https://github.com/docker-library/official-images/blob/master/library/percona). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fpercona).

--- a/photon/README.md
+++ b/photon/README.md
@ -50,7 +50,7 @@ Documentation for this image is stored in the [`photon/` directory](https://gith

 ## Issues

-If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/frapposelli/photon-docker-image/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
+If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/vmware/photon-docker-image/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).

 You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).

@ -58,4 +58,4 @@ You can also reach many of the official image maintainers via the `#docker-libra

 You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.

-Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/frapposelli/photon-docker-image/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
+Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/vmware/photon-docker-image/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
--- a/photon/github-repo
+++ b/photon/github-repo
@ -1 +1 @@
-https://github.com/frapposelli/photon-docker-image
+https://github.com/vmware/photon-docker-image
--- a/php/README.md
+++ b/php/README.md
@ -1,19 +1,26 @@
 # Supported tags and respective `Dockerfile` links

-	[`7.0.10-cli`, `7.0-cli`, `7-cli`, `cli`, `7.0.10`, `7.0`, `7`, `latest` (*7.0/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/7.0/Dockerfile)
-	[`7.0.10-alpine`, `7.0-alpine`, `7-alpine`, `alpine` (*7.0/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/7.0/alpine/Dockerfile)
-	[`7.0.10-apache`, `7.0-apache`, `7-apache`, `apache` (*7.0/apache/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/7.0/apache/Dockerfile)
-	[`7.0.10-fpm`, `7.0-fpm`, `7-fpm`, `fpm` (*7.0/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/7.0/fpm/Dockerfile)
-	[`7.0.10-fpm-alpine`, `7.0-fpm-alpine`, `7-fpm-alpine`, `fpm-alpine` (*7.0/fpm/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/7.0/fpm/alpine/Dockerfile)
-	[`7.0.10-zts`, `7.0-zts`, `7-zts`, `zts` (*7.0/zts/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/7.0/zts/Dockerfile)
-	[`7.0.10-zts-alpine`, `7.0-zts-alpine`, `7-zts-alpine`, `zts-alpine` (*7.0/zts/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/7.0/zts/alpine/Dockerfile)
-	[`5.6.25-cli`, `5.6-cli`, `5-cli`, `5.6.25`, `5.6`, `5` (*5.6/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/5.6/Dockerfile)
-	[`5.6.25-alpine`, `5.6-alpine`, `5-alpine` (*5.6/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/5.6/alpine/Dockerfile)
-	[`5.6.25-apache`, `5.6-apache`, `5-apache` (*5.6/apache/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/5.6/apache/Dockerfile)
-	[`5.6.25-fpm`, `5.6-fpm`, `5-fpm` (*5.6/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/5.6/fpm/Dockerfile)
-	[`5.6.25-fpm-alpine`, `5.6-fpm-alpine`, `5-fpm-alpine` (*5.6/fpm/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/5.6/fpm/alpine/Dockerfile)
-	[`5.6.25-zts`, `5.6-zts`, `5-zts` (*5.6/zts/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/5.6/zts/Dockerfile)
-	[`5.6.25-zts-alpine`, `5.6-zts-alpine`, `5-zts-alpine` (*5.6/zts/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/2f96a00aaa90ee1c503140724936ca7005273df5/5.6/zts/alpine/Dockerfile)
+-	[`7.1.0RC3-cli`, `7.1-cli`, `7.1.0RC3`, `7.1` (*7.1/Dockerfile*)](https://github.com/docker-library/php/blob/cbca335c53456146e4dc868a1dac08bd66a1b019/7.1/Dockerfile)
+-	[`7.1.0RC3-alpine`, `7.1-alpine` (*7.1/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/cbca335c53456146e4dc868a1dac08bd66a1b019/7.1/alpine/Dockerfile)
+-	[`7.1.0RC3-apache`, `7.1-apache` (*7.1/apache/Dockerfile*)](https://github.com/docker-library/php/blob/cbca335c53456146e4dc868a1dac08bd66a1b019/7.1/apache/Dockerfile)
+-	[`7.1.0RC3-fpm`, `7.1-fpm` (*7.1/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/cbca335c53456146e4dc868a1dac08bd66a1b019/7.1/fpm/Dockerfile)
+-	[`7.1.0RC3-fpm-alpine`, `7.1-fpm-alpine` (*7.1/fpm/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/cbca335c53456146e4dc868a1dac08bd66a1b019/7.1/fpm/alpine/Dockerfile)
+-	[`7.1.0RC3-zts`, `7.1-zts` (*7.1/zts/Dockerfile*)](https://github.com/docker-library/php/blob/cbca335c53456146e4dc868a1dac08bd66a1b019/7.1/zts/Dockerfile)
+-	[`7.1.0RC3-zts-alpine`, `7.1-zts-alpine` (*7.1/zts/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/cbca335c53456146e4dc868a1dac08bd66a1b019/7.1/zts/alpine/Dockerfile)
+-	[`7.0.11-cli`, `7.0-cli`, `7-cli`, `cli`, `7.0.11`, `7.0`, `7`, `latest` (*7.0/Dockerfile*)](https://github.com/docker-library/php/blob/6924505927f75e74098cc55e53e4f66bf71e0068/7.0/Dockerfile)
+-	[`7.0.11-alpine`, `7.0-alpine`, `7-alpine`, `alpine` (*7.0/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/6924505927f75e74098cc55e53e4f66bf71e0068/7.0/alpine/Dockerfile)
+-	[`7.0.11-apache`, `7.0-apache`, `7-apache`, `apache` (*7.0/apache/Dockerfile*)](https://github.com/docker-library/php/blob/6924505927f75e74098cc55e53e4f66bf71e0068/7.0/apache/Dockerfile)
+-	[`7.0.11-fpm`, `7.0-fpm`, `7-fpm`, `fpm` (*7.0/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/6924505927f75e74098cc55e53e4f66bf71e0068/7.0/fpm/Dockerfile)
+-	[`7.0.11-fpm-alpine`, `7.0-fpm-alpine`, `7-fpm-alpine`, `fpm-alpine` (*7.0/fpm/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/6924505927f75e74098cc55e53e4f66bf71e0068/7.0/fpm/alpine/Dockerfile)
+-	[`7.0.11-zts`, `7.0-zts`, `7-zts`, `zts` (*7.0/zts/Dockerfile*)](https://github.com/docker-library/php/blob/6924505927f75e74098cc55e53e4f66bf71e0068/7.0/zts/Dockerfile)
+-	[`7.0.11-zts-alpine`, `7.0-zts-alpine`, `7-zts-alpine`, `zts-alpine` (*7.0/zts/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/6924505927f75e74098cc55e53e4f66bf71e0068/7.0/zts/alpine/Dockerfile)
+-	[`5.6.26-cli`, `5.6-cli`, `5-cli`, `5.6.26`, `5.6`, `5` (*5.6/Dockerfile*)](https://github.com/docker-library/php/blob/1c56325a69718a3e3cf76179e75d070b7e23da62/5.6/Dockerfile)
+-	[`5.6.26-alpine`, `5.6-alpine`, `5-alpine` (*5.6/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/1c56325a69718a3e3cf76179e75d070b7e23da62/5.6/alpine/Dockerfile)
+-	[`5.6.26-apache`, `5.6-apache`, `5-apache` (*5.6/apache/Dockerfile*)](https://github.com/docker-library/php/blob/1c56325a69718a3e3cf76179e75d070b7e23da62/5.6/apache/Dockerfile)
+-	[`5.6.26-fpm`, `5.6-fpm`, `5-fpm` (*5.6/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/1c56325a69718a3e3cf76179e75d070b7e23da62/5.6/fpm/Dockerfile)
+-	[`5.6.26-fpm-alpine`, `5.6-fpm-alpine`, `5-fpm-alpine` (*5.6/fpm/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/1c56325a69718a3e3cf76179e75d070b7e23da62/5.6/fpm/alpine/Dockerfile)
+-	[`5.6.26-zts`, `5.6-zts`, `5-zts` (*5.6/zts/Dockerfile*)](https://github.com/docker-library/php/blob/1c56325a69718a3e3cf76179e75d070b7e23da62/5.6/zts/Dockerfile)
+-	[`5.6.26-zts-alpine`, `5.6-zts-alpine`, `5-zts-alpine` (*5.6/zts/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/1c56325a69718a3e3cf76179e75d070b7e23da62/5.6/zts/alpine/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). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fphp).

--- a/piwik/README.md
+++ b/piwik/README.md
@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links

-	[`2.16.2`, `2.16`, `2`, `latest` (*Dockerfile*)](https://github.com/piwik/docker-piwik/blob/5e0bb9e49ae72291cf357c9ef1b4671c4ae25f9c/Dockerfile)
+-	[`2.16.2`, `2.16`, `2`, `latest` (*Dockerfile*)](https://github.com/piwik/docker-piwik/blob/2f8892a595e78b966141d70d51fdef5e6d627298/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/piwik`)](https://github.com/docker-library/official-images/blob/master/library/piwik). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fpiwik).

--- a/postgres/README.md
+++ b/postgres/README.md
@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links

-	[`9.6-beta4`, `9.6` (*9.6/Dockerfile*)](https://github.com/docker-library/postgres/blob/fc36c25f8ac352f1fea6d0e7cf8d9bd92a4e720f/9.6/Dockerfile)
-	[`9.5.4`, `9.5`, `9`, `latest` (*9.5/Dockerfile*)](https://github.com/docker-library/postgres/blob/fc36c25f8ac352f1fea6d0e7cf8d9bd92a4e720f/9.5/Dockerfile)
+-	[`9.6.0`, `9.6`, `9`, `latest` (*9.6/Dockerfile*)](https://github.com/docker-library/postgres/blob/b2317dd369030a5f3f030b1daa1fc80da3cab9e0/9.6/Dockerfile)
+-	[`9.5.4`, `9.5` (*9.5/Dockerfile*)](https://github.com/docker-library/postgres/blob/1c0bc9d905d569fead777b9b8e3836e8af1c394c/9.5/Dockerfile)
 -	[`9.4.9`, `9.4` (*9.4/Dockerfile*)](https://github.com/docker-library/postgres/blob/fc36c25f8ac352f1fea6d0e7cf8d9bd92a4e720f/9.4/Dockerfile)
 -	[`9.3.14`, `9.3` (*9.3/Dockerfile*)](https://github.com/docker-library/postgres/blob/fc36c25f8ac352f1fea6d0e7cf8d9bd92a4e720f/9.3/Dockerfile)
 -	[`9.2.18`, `9.2` (*9.2/Dockerfile*)](https://github.com/docker-library/postgres/blob/fc36c25f8ac352f1fea6d0e7cf8d9bd92a4e720f/9.2/Dockerfile)
--- a/pypy/README.md
+++ b/pypy/README.md
@ -1,10 +1,10 @@
 # Supported tags and respective `Dockerfile` links

-	[`2-5.4.0`, `2-5.4`, `2-5`, `2` (*2/Dockerfile*)](https://github.com/docker-library/pypy/blob/8f0599b2696145385f3183dee5b1cabb0baa268c/2/Dockerfile)
-	[`2-5.4.0-slim`, `2-5.4-slim`, `2-5-slim`, `2-slim` (*2/slim/Dockerfile*)](https://github.com/docker-library/pypy/blob/8f0599b2696145385f3183dee5b1cabb0baa268c/2/slim/Dockerfile)
-	[`2-5.4.0-onbuild`, `2-5.4-onbuild`, `2-5-onbuild`, `2-onbuild` (*2/onbuild/Dockerfile*)](https://github.com/docker-library/pypy/blob/b48e8489ab794a2bacfd396c2f8e1a5b06d6ae48/2/onbuild/Dockerfile)
-	[`3-5.2.0-alpha1`, `3-5.2.0`, `3-5.2`, `3-5`, `3`, `latest` (*3/Dockerfile*)](https://github.com/docker-library/pypy/blob/cdf5a7cd566bc418aff8eb383b431abb3ea88e50/3/Dockerfile)
-	[`3-5.2.0-alpha1-slim`, `3-5.2.0-slim`, `3-5.2-slim`, `3-5-slim`, `3-slim`, `slim` (*3/slim/Dockerfile*)](https://github.com/docker-library/pypy/blob/cdf5a7cd566bc418aff8eb383b431abb3ea88e50/3/slim/Dockerfile)
+-	[`2-5.4.1`, `2-5.4`, `2-5`, `2` (*2/Dockerfile*)](https://github.com/docker-library/pypy/blob/8a1c5f0710de482fcac5247c16b5918fedfc07de/2/Dockerfile)
+-	[`2-5.4.1-slim`, `2-5.4-slim`, `2-5-slim`, `2-slim` (*2/slim/Dockerfile*)](https://github.com/docker-library/pypy/blob/8a1c5f0710de482fcac5247c16b5918fedfc07de/2/slim/Dockerfile)
+-	[`2-5.4.1-onbuild`, `2-5.4-onbuild`, `2-5-onbuild`, `2-onbuild` (*2/onbuild/Dockerfile*)](https://github.com/docker-library/pypy/blob/b48e8489ab794a2bacfd396c2f8e1a5b06d6ae48/2/onbuild/Dockerfile)
+-	[`3-5.2.0-alpha1`, `3-5.2.0`, `3-5.2`, `3-5`, `3`, `latest` (*3/Dockerfile*)](https://github.com/docker-library/pypy/blob/72cec48996d57b0e30b0bf1447c89847a0dbd368/3/Dockerfile)
+-	[`3-5.2.0-alpha1-slim`, `3-5.2.0-slim`, `3-5.2-slim`, `3-5-slim`, `3-slim`, `slim` (*3/slim/Dockerfile*)](https://github.com/docker-library/pypy/blob/72cec48996d57b0e30b0bf1447c89847a0dbd368/3/slim/Dockerfile)
 -	[`3-5.2.0-alpha1-onbuild`, `3-5.2.0-onbuild`, `3-5.2-onbuild`, `3-5-onbuild`, `3-onbuild`, `onbuild` (*3/onbuild/Dockerfile*)](https://github.com/docker-library/pypy/blob/b48e8489ab794a2bacfd396c2f8e1a5b06d6ae48/3/onbuild/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/pypy`)](https://github.com/docker-library/official-images/blob/master/library/pypy). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fpypy).
--- a/python/README.md
+++ b/python/README.md
@ -21,10 +21,10 @@
 -	[`3.5.2-alpine`, `3.5-alpine`, `3-alpine`, `alpine` (*3.5/alpine/Dockerfile*)](https://github.com/docker-library/python/blob/855b85c8309e925814dfa97d61310080dcd08db6/3.5/alpine/Dockerfile)
 -	[`3.5.2-onbuild`, `3.5-onbuild`, `3-onbuild`, `onbuild` (*3.5/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/9a9021f2134d953165b31d98cacb95aa34076f90/3.5/onbuild/Dockerfile)
 -	[`3.5.2-windowsservercore`, `3.5-windowsservercore`, `3-windowsservercore`, `windowsservercore` (*3.5/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/python/blob/855b85c8309e925814dfa97d61310080dcd08db6/3.5/windows/windowsservercore/Dockerfile)
-	[`3.6.0a4`, `3.6` (*3.6/Dockerfile*)](https://github.com/docker-library/python/blob/855b85c8309e925814dfa97d61310080dcd08db6/3.6/Dockerfile)
-	[`3.6.0a4-slim`, `3.6-slim` (*3.6/slim/Dockerfile*)](https://github.com/docker-library/python/blob/855b85c8309e925814dfa97d61310080dcd08db6/3.6/slim/Dockerfile)
-	[`3.6.0a4-alpine`, `3.6-alpine` (*3.6/alpine/Dockerfile*)](https://github.com/docker-library/python/blob/855b85c8309e925814dfa97d61310080dcd08db6/3.6/alpine/Dockerfile)
-	[`3.6.0a4-onbuild`, `3.6-onbuild` (*3.6/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/635ea5d58b53d165f7bedae90f8933c720a58150/3.6/onbuild/Dockerfile)
+-	[`3.6.0b1`, `3.6` (*3.6/Dockerfile*)](https://github.com/docker-library/python/blob/a70c6819aa38d938d56e96408aa6e7c3a9162c64/3.6/Dockerfile)
+-	[`3.6.0b1-slim`, `3.6-slim` (*3.6/slim/Dockerfile*)](https://github.com/docker-library/python/blob/a70c6819aa38d938d56e96408aa6e7c3a9162c64/3.6/slim/Dockerfile)
+-	[`3.6.0b1-alpine`, `3.6-alpine` (*3.6/alpine/Dockerfile*)](https://github.com/docker-library/python/blob/a70c6819aa38d938d56e96408aa6e7c3a9162c64/3.6/alpine/Dockerfile)
+-	[`3.6.0b1-onbuild`, `3.6-onbuild` (*3.6/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/635ea5d58b53d165f7bedae90f8933c720a58150/3.6/onbuild/Dockerfile)
 -	[`3.6.0a4-windowsservercore`, `3.6-windowsservercore` (*3.6/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/python/blob/855b85c8309e925814dfa97d61310080dcd08db6/3.6/windows/windowsservercore/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/python`)](https://github.com/docker-library/official-images/blob/master/library/python). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fpython).
--- a/redis/README.md
+++ b/redis/README.md
@ -3,9 +3,9 @@
 -	[`3.0.7`, `3.0` (*3.0/Dockerfile*)](https://github.com/docker-library/redis/blob/6cb8a8015f126e2a7251c5d011b86b657e9febd6/3.0/Dockerfile)
 -	[`3.0.7-32bit`, `3.0-32bit` (*3.0/32bit/Dockerfile*)](https://github.com/docker-library/redis/blob/6cb8a8015f126e2a7251c5d011b86b657e9febd6/3.0/32bit/Dockerfile)
 -	[`3.0.7-alpine`, `3.0-alpine` (*3.0/alpine/Dockerfile*)](https://github.com/docker-library/redis/blob/c49a42f6efcd2b971e43e93116a976b058035544/3.0/alpine/Dockerfile)
-	[`3.2.3`, `3.2`, `3`, `latest` (*3.2/Dockerfile*)](https://github.com/docker-library/redis/blob/71807ba24f85da5bc14e9251da3617bbb6f47146/3.2/Dockerfile)
-	[`3.2.3-32bit`, `3.2-32bit`, `3-32bit`, `32bit` (*3.2/32bit/Dockerfile*)](https://github.com/docker-library/redis/blob/71807ba24f85da5bc14e9251da3617bbb6f47146/3.2/32bit/Dockerfile)
-	[`3.2.3-alpine`, `3.2-alpine`, `3-alpine`, `alpine` (*3.2/alpine/Dockerfile*)](https://github.com/docker-library/redis/blob/71807ba24f85da5bc14e9251da3617bbb6f47146/3.2/alpine/Dockerfile)
+-	[`3.2.4`, `3.2`, `3`, `latest` (*3.2/Dockerfile*)](https://github.com/docker-library/redis/blob/a38166e6f3430512ba8ce2cb5ebd889ee17b9dc4/3.2/Dockerfile)
+-	[`3.2.4-32bit`, `3.2-32bit`, `3-32bit`, `32bit` (*3.2/32bit/Dockerfile*)](https://github.com/docker-library/redis/blob/a38166e6f3430512ba8ce2cb5ebd889ee17b9dc4/3.2/32bit/Dockerfile)
+-	[`3.2.4-alpine`, `3.2-alpine`, `3-alpine`, `alpine` (*3.2/alpine/Dockerfile*)](https://github.com/docker-library/redis/blob/a38166e6f3430512ba8ce2cb5ebd889ee17b9dc4/3.2/alpine/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). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fredis).

--- a/redmine/README.md
+++ b/redmine/README.md
@ -1,10 +1,10 @@
 # Supported tags and respective `Dockerfile` links

-	[`3.1.6`, `3.1` (*3.1/Dockerfile*)](https://github.com/docker-library/redmine/blob/c7fbe17fb7c3f1b33cb2d6fbdeaf1ee42ac9cbb9/3.1/Dockerfile)
+-	[`3.1.6`, `3.1` (*3.1/Dockerfile*)](https://github.com/docker-library/redmine/blob/dd11f72412d392db8b8a86ed81821643f8a52835/3.1/Dockerfile)
 -	[`3.1.6-passenger`, `3.1-passenger` (*3.1/passenger/Dockerfile*)](https://github.com/docker-library/redmine/blob/31ec3c8963424bbc1730806a65d9914c84df17de/3.1/passenger/Dockerfile)
-	[`3.2.3`, `3.2` (*3.2/Dockerfile*)](https://github.com/docker-library/redmine/blob/c7fbe17fb7c3f1b33cb2d6fbdeaf1ee42ac9cbb9/3.2/Dockerfile)
+-	[`3.2.3`, `3.2` (*3.2/Dockerfile*)](https://github.com/docker-library/redmine/blob/dd11f72412d392db8b8a86ed81821643f8a52835/3.2/Dockerfile)
 -	[`3.2.3-passenger`, `3.2-passenger` (*3.2/passenger/Dockerfile*)](https://github.com/docker-library/redmine/blob/31ec3c8963424bbc1730806a65d9914c84df17de/3.2/passenger/Dockerfile)
-	[`3.3.0`, `3.3`, `3`, `latest` (*3.3/Dockerfile*)](https://github.com/docker-library/redmine/blob/c7fbe17fb7c3f1b33cb2d6fbdeaf1ee42ac9cbb9/3.3/Dockerfile)
+-	[`3.3.0`, `3.3`, `3`, `latest` (*3.3/Dockerfile*)](https://github.com/docker-library/redmine/blob/dd11f72412d392db8b8a86ed81821643f8a52835/3.3/Dockerfile)
 -	[`3.3.0-passenger`, `3.3-passenger`, `3-passenger`, `passenger` (*3.3/passenger/Dockerfile*)](https://github.com/docker-library/redmine/blob/31ec3c8963424bbc1730806a65d9914c84df17de/3.3/passenger/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/redmine`)](https://github.com/docker-library/official-images/blob/master/library/redmine). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fredmine).
@ -55,6 +55,36 @@ Running Redmine with a database server is the recommened way.
 	$ docker run -d --name some-redmine --link some-postgres:postgres redmine
 	```

+## ... via [`docker-compose`](https://github.com/docker/compose)
+
+Example `docker-compose.yml` for `redmine`:
+
+```yaml
+version: '2'
+
+services:
+
+  redmine:
+    image: redmine
+    ports:
+      - 8080:3000
+    environment:
+      REDMINE_DB_MYSQL: db
+      REDMINE_DB_PASSWORD: example
+    depends_on:
+      - db
+    restart: always
+
+  db:
+    image: mariadb
+    environment:
+      MYSQL_ROOT_PASSWORD: example
+      MYSQL_DATABASE: redmine
+    restart: always
+```
+
+Run `docker-compose up`, wait for it to initialize completely, and visit `http://localhost:8080` or `http://host-ip:8080`.
+
 ## Alternative Web Server

 The other tags in this repository, like those with `passenger`, use the same environment and `--links` as the default tags that use WEBrick (`rails s`) but instead give you the option of a different web and application server. `passenger` uses [Phusion Passenger](https://www.phusionpassenger.com/). [`tini`](https://github.com/krallin/tini) is used for reaping [zombies](https://en.wikipedia.org/wiki/Zombie_process).
--- a/redmine/content.md
+++ b/redmine/content.md
@ -42,6 +42,10 @@ Running Redmine with a database server is the recommened way.
 	$ docker run -d --name some-%%REPO%% --link some-postgres:postgres %%REPO%%
 	```

+## %%COMPOSE%%
+
+Run `docker-compose up`, wait for it to initialize completely, and visit `http://localhost:8080` or `http://host-ip:8080`.
+
 ## Alternative Web Server

 The other tags in this repository, like those with `passenger`, use the same environment and `--links` as the default tags that use WEBrick (`rails s`) but instead give you the option of a different web and application server. `passenger` uses [Phusion Passenger](https://www.phusionpassenger.com/). [`tini`](https://github.com/krallin/tini) is used for reaping [zombies](https://en.wikipedia.org/wiki/Zombie_process).
--- a/redmine/docker-compose.yml
+++ b/redmine/docker-compose.yml
@ -0,0 +1,21 @@
+version: '2'
+
+services:
+
+  redmine:
+    image: redmine
+    ports:
+      - 8080:3000
+    environment:
+      REDMINE_DB_MYSQL: db
+      REDMINE_DB_PASSWORD: example
+    depends_on:
+      - db
+    restart: always
+
+  db:
+    image: mariadb
+    environment:
+      MYSQL_ROOT_PASSWORD: example
+      MYSQL_DATABASE: redmine
+    restart: always
--- a/registry/README.md
+++ b/registry/README.md
@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links

-	[`2`, `2.5`, `2.5.0`, `latest` (*Dockerfile*)](https://github.com/docker/distribution-library-image/blob/f7992f4a9f7fade2be6240ffe84270b9438fc1bf/Dockerfile)
+-	[`2`, `2.5`, `2.5.1`, `latest` (*Dockerfile*)](https://github.com/docker/distribution-library-image/blob/3b4a84c1f152b60688e99d2efadf305479541482/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/registry`)](https://github.com/docker-library/official-images/blob/master/library/registry). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fregistry).

--- a/rocket.chat/README.md
+++ b/rocket.chat/README.md
@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links

-	[`0.38.0`, `0.38`, `0`, `latest` (*Dockerfile*)](https://github.com/RocketChat/Docker.Official.Image/blob/f26193a41722ad47bf649d443e87b2effd8e7c44/Dockerfile)
+-	[`0.41.0`, `0.41`, `0`, `latest` (*Dockerfile*)](https://github.com/RocketChat/Docker.Official.Image/blob/7a26ad31bfcebb1980d76056a15b0828e86f5e4e/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/rocket.chat`)](https://github.com/docker-library/official-images/blob/master/library/rocket.chat). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Frocket.chat).

--- a/ruby/README.md
+++ b/ruby/README.md
@ -1,16 +1,16 @@
 # Supported tags and respective `Dockerfile` links

-	[`2.1.10`, `2.1` (*2.1/Dockerfile*)](https://github.com/docker-library/ruby/blob/b0dac732e8b7a64a32e09f1cc8fa93cea8edc785/2.1/Dockerfile)
-	[`2.1.10-slim`, `2.1-slim` (*2.1/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/b0dac732e8b7a64a32e09f1cc8fa93cea8edc785/2.1/slim/Dockerfile)
-	[`2.1.10-alpine`, `2.1-alpine` (*2.1/alpine/Dockerfile*)](https://github.com/docker-library/ruby/blob/b0dac732e8b7a64a32e09f1cc8fa93cea8edc785/2.1/alpine/Dockerfile)
+-	[`2.1.10`, `2.1` (*2.1/Dockerfile*)](https://github.com/docker-library/ruby/blob/ebb58ab86991c098a1ca70b4a5969d2ba8c5c9b2/2.1/Dockerfile)
+-	[`2.1.10-slim`, `2.1-slim` (*2.1/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/ebb58ab86991c098a1ca70b4a5969d2ba8c5c9b2/2.1/slim/Dockerfile)
+-	[`2.1.10-alpine`, `2.1-alpine` (*2.1/alpine/Dockerfile*)](https://github.com/docker-library/ruby/blob/ebb58ab86991c098a1ca70b4a5969d2ba8c5c9b2/2.1/alpine/Dockerfile)
 -	[`2.1.10-onbuild`, `2.1-onbuild` (*2.1/onbuild/Dockerfile*)](https://github.com/docker-library/ruby/blob/5d04363db6f7ae316ef7056063f020557db828e1/2.1/onbuild/Dockerfile)
-	[`2.2.5`, `2.2` (*2.2/Dockerfile*)](https://github.com/docker-library/ruby/blob/2d6449f03976ededa14be5cac1e9e070b74e4de4/2.2/Dockerfile)
-	[`2.2.5-slim`, `2.2-slim` (*2.2/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/2d6449f03976ededa14be5cac1e9e070b74e4de4/2.2/slim/Dockerfile)
-	[`2.2.5-alpine`, `2.2-alpine` (*2.2/alpine/Dockerfile*)](https://github.com/docker-library/ruby/blob/2d6449f03976ededa14be5cac1e9e070b74e4de4/2.2/alpine/Dockerfile)
+-	[`2.2.5`, `2.2` (*2.2/Dockerfile*)](https://github.com/docker-library/ruby/blob/91203f150b9ca4262718800c84251cf7a8e3cb27/2.2/Dockerfile)
+-	[`2.2.5-slim`, `2.2-slim` (*2.2/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/91203f150b9ca4262718800c84251cf7a8e3cb27/2.2/slim/Dockerfile)
+-	[`2.2.5-alpine`, `2.2-alpine` (*2.2/alpine/Dockerfile*)](https://github.com/docker-library/ruby/blob/91203f150b9ca4262718800c84251cf7a8e3cb27/2.2/alpine/Dockerfile)
 -	[`2.2.5-onbuild`, `2.2-onbuild` (*2.2/onbuild/Dockerfile*)](https://github.com/docker-library/ruby/blob/5d04363db6f7ae316ef7056063f020557db828e1/2.2/onbuild/Dockerfile)
-	[`2.3.1`, `2.3`, `2`, `latest` (*2.3/Dockerfile*)](https://github.com/docker-library/ruby/blob/2d6449f03976ededa14be5cac1e9e070b74e4de4/2.3/Dockerfile)
-	[`2.3.1-slim`, `2.3-slim`, `2-slim`, `slim` (*2.3/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/2d6449f03976ededa14be5cac1e9e070b74e4de4/2.3/slim/Dockerfile)
-	[`2.3.1-alpine`, `2.3-alpine`, `2-alpine`, `alpine` (*2.3/alpine/Dockerfile*)](https://github.com/docker-library/ruby/blob/2d6449f03976ededa14be5cac1e9e070b74e4de4/2.3/alpine/Dockerfile)
+-	[`2.3.1`, `2.3`, `2`, `latest` (*2.3/Dockerfile*)](https://github.com/docker-library/ruby/blob/e89be7d60685ec51a193a358a8f3364b287aee3b/2.3/Dockerfile)
+-	[`2.3.1-slim`, `2.3-slim`, `2-slim`, `slim` (*2.3/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/e89be7d60685ec51a193a358a8f3364b287aee3b/2.3/slim/Dockerfile)
+-	[`2.3.1-alpine`, `2.3-alpine`, `2-alpine`, `alpine` (*2.3/alpine/Dockerfile*)](https://github.com/docker-library/ruby/blob/e89be7d60685ec51a193a358a8f3364b287aee3b/2.3/alpine/Dockerfile)
 -	[`2.3.1-onbuild`, `2.3-onbuild`, `2-onbuild`, `onbuild` (*2.3/onbuild/Dockerfile*)](https://github.com/docker-library/ruby/blob/1b08f346713a1293c2a9238e470e086126e2e28f/2.3/onbuild/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/ruby`)](https://github.com/docker-library/official-images/blob/master/library/ruby). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fruby).
@ -62,6 +62,10 @@ For many simple, single file projects, you may find it inconvenient to write a c
 $ docker run -it --rm --name my-running-script -v "$PWD":/usr/src/myapp -w /usr/src/myapp ruby:2.1 ruby your-daemon-or-script.rb
 ```

+## Encoding
+
+By default, Ruby inherits the locale of the environment in which it is run. For most users running Ruby on their desktop systems, that means it's likely using some variation of `*.UTF-8` (`en_US.UTF-8`, etc). In Docker however, the default locale is `C`, which can have unexpected results. If your application needs to interact with UTF-8, it is recommended that you explicitly adjust the locale of your image/container via `-e LANG=C.UTF-8` or `ENV LANG C.UTF-8`.
+
 # Image Variants

 The `ruby` images come in many flavors, each designed for a specific use case.
--- a/ruby/content.md
+++ b/ruby/content.md
@ -42,3 +42,7 @@ For many simple, single file projects, you may find it inconvenient to write a c
 ```console
 $ docker run -it --rm --name my-running-script -v "$PWD":/usr/src/myapp -w /usr/src/myapp ruby:2.1 ruby your-daemon-or-script.rb
 ```
+
+## Encoding
+
+By default, Ruby inherits the locale of the environment in which it is run. For most users running Ruby on their desktop systems, that means it's likely using some variation of `*.UTF-8` (`en_US.UTF-8`, etc). In Docker however, the default locale is `C`, which can have unexpected results. If your application needs to interact with UTF-8, it is recommended that you explicitly adjust the locale of your image/container via `-e LANG=C.UTF-8` or `ENV LANG C.UTF-8`.
--- a/sentry/README.md
+++ b/sentry/README.md
@ -1,9 +1,9 @@
 # Supported tags and respective `Dockerfile` links

-	[`8.6.0`, `8.6` (*8.6/Dockerfile*)](https://github.com/getsentry/docker-sentry/blob/2bef8f6386c891f9b8ce1d6940f0aff81c25d475/8.6/Dockerfile)
-	[`8.6.0-onbuild`, `8.6-onbuild` (*8.6/onbuild/Dockerfile*)](https://github.com/getsentry/docker-sentry/blob/09d2b56ded2f669f40d5295bfe36529bbafb914d/8.6/onbuild/Dockerfile)
-	[`8.7.0`, `8.7`, `8`, `latest` (*8.7/Dockerfile*)](https://github.com/getsentry/docker-sentry/blob/2bef8f6386c891f9b8ce1d6940f0aff81c25d475/8.7/Dockerfile)
-	[`8.7.0-onbuild`, `8.7-onbuild`, `8-onbuild`, `onbuild` (*8.7/onbuild/Dockerfile*)](https://github.com/getsentry/docker-sentry/blob/22e75e5254b5707b77a747cd4e90bc4327f2ce9b/8.7/onbuild/Dockerfile)
+-	[`8.8.0`, `8.8` (*8.8/Dockerfile*)](https://github.com/getsentry/docker-sentry/blob/90e5f20bf418a42986c9716d07a4de980a4dfc07/8.8/Dockerfile)
+-	[`8.8.0-onbuild`, `8.8-onbuild` (*8.8/onbuild/Dockerfile*)](https://github.com/getsentry/docker-sentry/blob/90e5f20bf418a42986c9716d07a4de980a4dfc07/8.8/onbuild/Dockerfile)
+-	[`8.9.0`, `8.9`, `8`, `latest` (*8.9/Dockerfile*)](https://github.com/getsentry/docker-sentry/blob/06d750bddc0e6499446e73ca22fbd4c915b29cbd/8.9/Dockerfile)
+-	[`8.9.0-onbuild`, `8.9-onbuild`, `8-onbuild`, `onbuild` (*8.9/onbuild/Dockerfile*)](https://github.com/getsentry/docker-sentry/blob/06d750bddc0e6499446e73ca22fbd4c915b29cbd/8.9/onbuild/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/sentry`)](https://github.com/docker-library/official-images/blob/master/library/sentry). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fsentry).

--- a/solr/README.md
+++ b/solr/README.md
@ -1,17 +1,17 @@
 # Supported tags and respective `Dockerfile` links

-	[`5.3.2`, `5.3` (*5.3/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/1c2f9a0791e854c05c41952d5a086d57ebadc5f2/5.3/Dockerfile)
-	[`5.3.2-alpine`, `5.3-alpine` (*5.3/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/1c2f9a0791e854c05c41952d5a086d57ebadc5f2/5.3/alpine/Dockerfile)
-	[`5.4.1`, `5.4` (*5.4/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/1c2f9a0791e854c05c41952d5a086d57ebadc5f2/5.4/Dockerfile)
-	[`5.4.1-alpine`, `5.4-alpine` (*5.4/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/1c2f9a0791e854c05c41952d5a086d57ebadc5f2/5.4/alpine/Dockerfile)
-	[`5.5.2`, `5.5`, `5` (*5.5/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/47c11e69172fdb71c8c1824e6b1b5eb64ce3ec13/5.5/Dockerfile)
-	[`5.5.2-alpine`, `5.5-alpine`, `5-alpine` (*5.5/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/47c11e69172fdb71c8c1824e6b1b5eb64ce3ec13/5.5/alpine/Dockerfile)
-	[`6.0.1`, `6.0` (*6.0/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/1c2f9a0791e854c05c41952d5a086d57ebadc5f2/6.0/Dockerfile)
-	[`6.0.1-alpine`, `6.0-alpine` (*6.0/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/1c2f9a0791e854c05c41952d5a086d57ebadc5f2/6.0/alpine/Dockerfile)
-	[`6.1.0`, `6.1` (*6.1/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/47c11e69172fdb71c8c1824e6b1b5eb64ce3ec13/6.1/Dockerfile)
-	[`6.1.0-alpine`, `6.1-alpine` (*6.1/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/47c11e69172fdb71c8c1824e6b1b5eb64ce3ec13/6.1/alpine/Dockerfile)
-	[`6.2.0`, `6.2`, `6`, `latest` (*6.2/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/47c11e69172fdb71c8c1824e6b1b5eb64ce3ec13/6.2/Dockerfile)
-	[`6.2.0-alpine`, `6.2-alpine`, `6-alpine`, `alpine` (*6.2/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/47c11e69172fdb71c8c1824e6b1b5eb64ce3ec13/6.2/alpine/Dockerfile)
+-	[`5.3.2`, `5.3` (*5.3/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/dfe2c80ca10ca9191ae8ce7c6193ecd47c6c0b5f/5.3/Dockerfile)
+-	[`5.3.2-alpine`, `5.3-alpine` (*5.3/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/dfe2c80ca10ca9191ae8ce7c6193ecd47c6c0b5f/5.3/alpine/Dockerfile)
+-	[`5.4.1`, `5.4` (*5.4/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/dfe2c80ca10ca9191ae8ce7c6193ecd47c6c0b5f/5.4/Dockerfile)
+-	[`5.4.1-alpine`, `5.4-alpine` (*5.4/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/dfe2c80ca10ca9191ae8ce7c6193ecd47c6c0b5f/5.4/alpine/Dockerfile)
+-	[`5.5.3`, `5.5`, `5` (*5.5/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/dfe2c80ca10ca9191ae8ce7c6193ecd47c6c0b5f/5.5/Dockerfile)
+-	[`5.5.3-alpine`, `5.5-alpine`, `5-alpine` (*5.5/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/dfe2c80ca10ca9191ae8ce7c6193ecd47c6c0b5f/5.5/alpine/Dockerfile)
+-	[`6.0.1`, `6.0` (*6.0/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/dfe2c80ca10ca9191ae8ce7c6193ecd47c6c0b5f/6.0/Dockerfile)
+-	[`6.0.1-alpine`, `6.0-alpine` (*6.0/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/dfe2c80ca10ca9191ae8ce7c6193ecd47c6c0b5f/6.0/alpine/Dockerfile)
+-	[`6.1.0`, `6.1` (*6.1/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/dfe2c80ca10ca9191ae8ce7c6193ecd47c6c0b5f/6.1/Dockerfile)
+-	[`6.1.0-alpine`, `6.1-alpine` (*6.1/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/dfe2c80ca10ca9191ae8ce7c6193ecd47c6c0b5f/6.1/alpine/Dockerfile)
+-	[`6.2.1`, `6.2`, `6`, `latest` (*6.2/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/5f01cda7259bf25170d48bdb36c4ac268a749454/6.2/Dockerfile)
+-	[`6.2.1-alpine`, `6.2-alpine`, `6-alpine`, `alpine` (*6.2/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/5f01cda7259bf25170d48bdb36c4ac268a749454/6.2/alpine/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/solr`)](https://github.com/docker-library/official-images/blob/master/library/solr). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fsolr).

@ -29,6 +29,8 @@ Learn more on [Apache Solr homepage](http://lucene.apache.org/solr/) and in the

 # How to use this Docker image

+## Run Solr and index example data
+
 To run a single Solr server:

 ```console
@ -45,46 +47,147 @@ $ docker exec -it --user=solr my_solr bin/solr create_core -c gettingstarted

 In the web UI if you click on "Core Admin" you should now see the "gettingstarted" core.

-If you want to load some example data:
+If you want to load some of the example data that is included in the container:

 ```console
 $ docker exec -it --user=solr my_solr bin/post -c gettingstarted example/exampledocs/manufacturers.xml
 ```

-In the UI, find the "Core selector" popup menu and select the "gettingstarted" core, then select the "Query" menu item. This gives you a default search for "*:*" which returns all docs. Hit the "Execute Query" button, and you should see a few docs with data. Congratulations!
+In the UI, find the "Core selector" popup menu and select the "gettingstarted" core, then select the "Query" menu item. This gives you a default search for `*:*` which returns all docs. Hit the "Execute Query" button, and you should see a few docs with data. Congratulations!
+
+## Single-command demo
+
+For convenience, there is a single command that starts Solr, creates a collection called "demo", and loads sample data into it:
+
+```console
+$ docker run --name solr_demo -d -P solr solr-demo
+```
+
+## Loading your own data
+
+If you want load your own data, you'll have to make it available to the container, for example by copying it into the container:
+
+```console
+$ docker cp $HOME/mydata/mydata.xml my_solr:/opt/solr/mydata.xml
+$ docker exec -it --user=solr my_solr bin/post -c gettingstarted mydata.xml
+```
+
+or by using Docker host volumes:
+
+```console
+$ docker run --name my_solr -d -p 8983:8983 -t -v $HOME/mydata:/opt/solr/mydata solr
+$ docker exec -it --user=solr my_solr bin/solr create_core -c gettingstarted
+$ docker exec -it --user=solr my_solr bin/post -c gettingstarted mydata/mydata.xml
+```

 To learn more about Solr, see the [Apache Solr Reference Guide](https://cwiki.apache.org/confluence/display/solr/Apache+Solr+Reference+Guide).

+## Creating Cores
+
+In addition to the `docker exec` method explained above, you can create a core automatically at start time, in several ways.
+
+If you run:
+
+```console
+$ docker run -d -P solr solr-create -c mycore
+```
+
+the container will:
+
+-	run Solr in the background, on the loopback interface
+-	wait for it to start
+-	run the "solr create" command with the arguments you passed
+-	stop the background Solr
+-	start Solr in the foreground
+
+You can combine this with mounted volumes to pass in core configuration from your host:
+
+```console
+$ docker run -d -P -v $PWD/myconfig:/myconfig solr solr-create -c mycore -d /myconfig
+```
+
+When using the `solr-create` command, Solr will log to the standard docker log (inspect with `docker logs`), and the collection creation will happen in the background and log to `/opt/docker-solr/init.log`.
+
+This first way closely mirrors the manual core creation steps and uses Solr's own tools to create the core, so should be reliable.
+
+The second way of creating a core at start time is using the `solr-precreate` command. This will create the core in the filesystem before running Solr. You should pass it the core name, and optionally the directory to copy the config from (this defaults to Solr's built-in "basic_configs"). For example:
+
+```console
+$ docker run -d -P solr solr-precreate mycore
+$ docker run -d -P -v $PWD/myconfig:/myconfig solr solr-precreate mycore /myconfig
+```
+
+This method stores the core in an intermediate subdirectory called "mycores". This allows you to use mounted volumes:
+
+```console
+$ mkdir mycores
+$ sudo chown 8983:8983 mycores
+$ docker run -d -P -v $PWD/mycores:/opt/solr/server/solr/mycores solr solr-precreate mycore
+```
+
+This second way is quicker, easier to monitor because it logs to the docker log, and can fail immediately if something is wrong. But, because it makes assumptions about Solr's "basic_configs", future upstream changes could break that.
+
+The third way of creating a core at startup is to use the image extension mechanism explained in the next section.
+
+## Using Docker Compose
+
+With Docker Compose you can create a Solr container with the index stored in a named data volume. Create a `docker-compose.yml` like:
+
+```yml
+version: '2'
+services:
+  solr:
+    image: solr
+    ports:
+     - "8983:8983"
+    volumes:
+      - data:/opt/solr/server/solr/mycores
+    entrypoint:
+      - docker-entrypoint.sh
+      - solr-precreate
+      - mycore
+volumes:
+  data:
+```
+
+and just run `docker-compose up`.
+
+## Extending the image
+
+The docker-solr image has an extension mechanism. At run time, before starting Solr, the container will execute scripts in the `/docker-entrypoint-initdb.d/` directory. You can add your own scripts there either by using mounted volumes or by using a custom Dockerfile. These scripts can for example copy a core directory with pre-loaded data for continuous integration testing, or modify the Solr configuration.
+
+Here is a simple example. With a `set-heap.sh` script like:
+
+```console
+#!/bin/bash
+set -e
+cp /opt/solr/bin/solr.in.sh /opt/solr/bin/solr.in.sh.orig
+sed -e 's/SOLR_HEAP=".*"/SOLR_HEAP="1024m"/' </opt/solr/bin/solr.in.sh.orig >/opt/solr/bin/solr.in.sh
+grep '^SOLR_HEAP=' /opt/solr/bin/solr.in.sh
+```
+
+you can run:
+
+```console
+$ docker run --name solr_heap1 -d -P -v $PWD/docs/set-heap.sh:/docker-entrypoint-initdb.d/set-heap.sh solr
+$ sleep 5
+$ docker logs solr_heap1 | head
+/opt/docker-solr/scripts/docker-entrypoint.sh: running /docker-entrypoint-initdb.d/set-heap.sh
+SOLR_HEAP="1024m"
+
+
+Starting Solr on port 8983 from /opt/solr/server
+```
+
+With this extension mechanism it can be useful to see the shell commands that are being executed by the `docker-entrypoint.sh` script in the docker log. To do that, set an environment variable using Docker's `-e VERBOSE=yes`.
+
 ## Distributed Solr

-You can also run a distributed Solr configuration, with Solr nodes in separate containers, sharing a single ZooKeeper server:
+You can also run a distributed Solr configuration.

-Run ZooKeeper, and define a name so we can link to it:
+The recommended and most flexible way to do that is to use Docker networking. See the [Can I run ZooKeeper and Solr clusters under Docker](https://github.com/docker-solr/docker-solr/blob/master/Docker-FAQ.md#can-i-run-zookeeper-and-solr-clusters-under-docker) FAQ, and [this example](docs/docker-networking.md).

-```console
-$ docker run --name zookeeper -d -p 2181:2181 -p 2888:2888 -p 3888:3888 jplock/zookeeper
-```
-
-Run two Solr nodes, linked to the zookeeper container:
-
-```console
-$ docker run --name solr1 --link zookeeper:ZK -d -p 8983:8983 \
-      solr \
-      bash -c '/opt/solr/bin/solr start -f -z $ZK_PORT_2181_TCP_ADDR:$ZK_PORT_2181_TCP_PORT'
-
-$ docker run --name solr2 --link zookeeper:ZK -d -p 8984:8983 \
-      solr \
-      bash -c '/opt/solr/bin/solr start -f -z $ZK_PORT_2181_TCP_ADDR:$ZK_PORT_2181_TCP_PORT'
-```
-
-Create a collection:
-
-```console
-$ docker exec -i -t solr1 /opt/solr/bin/solr create_collection \
-        -c collection1 -shards 2 -p 8983
-```
-
-Then go to `http://localhost:8983/solr/#/~cloud` (adjust the hostname for your docker host) to see the two shards and Solr nodes.
+You can also use legacy links, see the [Can I run ZooKeeper and Solr with Docker Links](Docker-FAQ.md#can-i-run-zookeeper-and-solr-clusters-under-docker) FAQ.

 # About this repository

--- a/solr/content.md
+++ b/solr/content.md
@ -10,6 +10,8 @@ Learn more on [Apache Solr homepage](http://lucene.apache.org/solr/) and in the

 # How to use this Docker image

+## Run Solr and index example data
+
 To run a single Solr server:

 ```console
@ -26,46 +28,147 @@ $ docker exec -it --user=solr my_solr bin/solr create_core -c gettingstarted

 In the web UI if you click on "Core Admin" you should now see the "gettingstarted" core.

-If you want to load some example data:
+If you want to load some of the example data that is included in the container:

 ```console
 $ docker exec -it --user=solr my_solr bin/post -c gettingstarted example/exampledocs/manufacturers.xml
 ```

-In the UI, find the "Core selector" popup menu and select the "gettingstarted" core, then select the "Query" menu item. This gives you a default search for "*:*" which returns all docs. Hit the "Execute Query" button, and you should see a few docs with data. Congratulations!
+In the UI, find the "Core selector" popup menu and select the "gettingstarted" core, then select the "Query" menu item. This gives you a default search for `*:*` which returns all docs. Hit the "Execute Query" button, and you should see a few docs with data. Congratulations!
+
+## Single-command demo
+
+For convenience, there is a single command that starts Solr, creates a collection called "demo", and loads sample data into it:
+
+```console
+$ docker run --name solr_demo -d -P solr solr-demo
+```
+
+## Loading your own data
+
+If you want load your own data, you'll have to make it available to the container, for example by copying it into the container:
+
+```console
+$ docker cp $HOME/mydata/mydata.xml my_solr:/opt/solr/mydata.xml
+$ docker exec -it --user=solr my_solr bin/post -c gettingstarted mydata.xml
+```
+
+or by using Docker host volumes:
+
+```console
+$ docker run --name my_solr -d -p 8983:8983 -t -v $HOME/mydata:/opt/solr/mydata solr
+$ docker exec -it --user=solr my_solr bin/solr create_core -c gettingstarted
+$ docker exec -it --user=solr my_solr bin/post -c gettingstarted mydata/mydata.xml
+```

 To learn more about Solr, see the [Apache Solr Reference Guide](https://cwiki.apache.org/confluence/display/solr/Apache+Solr+Reference+Guide).

+## Creating Cores
+
+In addition to the `docker exec` method explained above, you can create a core automatically at start time, in several ways.
+
+If you run:
+
+```console
+$ docker run -d -P solr solr-create -c mycore
+```
+
+the container will:
+
+-	run Solr in the background, on the loopback interface
+-	wait for it to start
+-	run the "solr create" command with the arguments you passed
+-	stop the background Solr
+-	start Solr in the foreground
+
+You can combine this with mounted volumes to pass in core configuration from your host:
+
+```console
+$ docker run -d -P -v $PWD/myconfig:/myconfig solr solr-create -c mycore -d /myconfig
+```
+
+When using the `solr-create` command, Solr will log to the standard docker log (inspect with `docker logs`), and the collection creation will happen in the background and log to `/opt/docker-solr/init.log`.
+
+This first way closely mirrors the manual core creation steps and uses Solr's own tools to create the core, so should be reliable.
+
+The second way of creating a core at start time is using the `solr-precreate` command. This will create the core in the filesystem before running Solr. You should pass it the core name, and optionally the directory to copy the config from (this defaults to Solr's built-in "basic_configs"). For example:
+
+```console
+$ docker run -d -P solr solr-precreate mycore
+$ docker run -d -P -v $PWD/myconfig:/myconfig solr solr-precreate mycore /myconfig
+```
+
+This method stores the core in an intermediate subdirectory called "mycores". This allows you to use mounted volumes:
+
+```console
+$ mkdir mycores
+$ sudo chown 8983:8983 mycores
+$ docker run -d -P -v $PWD/mycores:/opt/solr/server/solr/mycores solr solr-precreate mycore
+```
+
+This second way is quicker, easier to monitor because it logs to the docker log, and can fail immediately if something is wrong. But, because it makes assumptions about Solr's "basic_configs", future upstream changes could break that.
+
+The third way of creating a core at startup is to use the image extension mechanism explained in the next section.
+
+## Using Docker Compose
+
+With Docker Compose you can create a Solr container with the index stored in a named data volume. Create a `docker-compose.yml` like:
+
+```yml
+version: '2'
+services:
+  solr:
+    image: solr
+    ports:
+     - "8983:8983"
+    volumes:
+      - data:/opt/solr/server/solr/mycores
+    entrypoint:
+      - docker-entrypoint.sh
+      - solr-precreate
+      - mycore
+volumes:
+  data:
+```
+
+and just run `docker-compose up`.
+
+## Extending the image
+
+The docker-solr image has an extension mechanism. At run time, before starting Solr, the container will execute scripts in the `/docker-entrypoint-initdb.d/` directory. You can add your own scripts there either by using mounted volumes or by using a custom Dockerfile. These scripts can for example copy a core directory with pre-loaded data for continuous integration testing, or modify the Solr configuration.
+
+Here is a simple example. With a `set-heap.sh` script like:
+
+```console
+#!/bin/bash
+set -e
+cp /opt/solr/bin/solr.in.sh /opt/solr/bin/solr.in.sh.orig
+sed -e 's/SOLR_HEAP=".*"/SOLR_HEAP="1024m"/' </opt/solr/bin/solr.in.sh.orig >/opt/solr/bin/solr.in.sh
+grep '^SOLR_HEAP=' /opt/solr/bin/solr.in.sh
+```
+
+you can run:
+
+```console
+$ docker run --name solr_heap1 -d -P -v $PWD/docs/set-heap.sh:/docker-entrypoint-initdb.d/set-heap.sh solr
+$ sleep 5
+$ docker logs solr_heap1 | head
+/opt/docker-solr/scripts/docker-entrypoint.sh: running /docker-entrypoint-initdb.d/set-heap.sh
+SOLR_HEAP="1024m"
+
+
+Starting Solr on port 8983 from /opt/solr/server
+```
+
+With this extension mechanism it can be useful to see the shell commands that are being executed by the `docker-entrypoint.sh` script in the docker log. To do that, set an environment variable using Docker's `-e VERBOSE=yes`.
+
 ## Distributed Solr

-You can also run a distributed Solr configuration, with Solr nodes in separate containers, sharing a single ZooKeeper server:
+You can also run a distributed Solr configuration.

-Run ZooKeeper, and define a name so we can link to it:
+The recommended and most flexible way to do that is to use Docker networking. See the [Can I run ZooKeeper and Solr clusters under Docker](https://github.com/docker-solr/docker-solr/blob/master/Docker-FAQ.md#can-i-run-zookeeper-and-solr-clusters-under-docker) FAQ, and [this example](docs/docker-networking.md).

-```console
-$ docker run --name zookeeper -d -p 2181:2181 -p 2888:2888 -p 3888:3888 jplock/zookeeper
-```
-
-Run two Solr nodes, linked to the zookeeper container:
-
-```console
-$ docker run --name solr1 --link zookeeper:ZK -d -p 8983:8983 \
-      solr \
-      bash -c '/opt/solr/bin/solr start -f -z $ZK_PORT_2181_TCP_ADDR:$ZK_PORT_2181_TCP_PORT'
-
-$ docker run --name solr2 --link zookeeper:ZK -d -p 8984:8983 \
-      solr \
-      bash -c '/opt/solr/bin/solr start -f -z $ZK_PORT_2181_TCP_ADDR:$ZK_PORT_2181_TCP_PORT'
-```
-
-Create a collection:
-
-```console
-$ docker exec -i -t solr1 /opt/solr/bin/solr create_collection \
-        -c collection1 -shards 2 -p 8983
-```
-
-Then go to `http://localhost:8983/solr/#/~cloud` (adjust the hostname for your docker host) to see the two shards and Solr nodes.
+You can also use legacy links, see the [Can I run ZooKeeper and Solr with Docker Links](Docker-FAQ.md#can-i-run-zookeeper-and-solr-clusters-under-docker) FAQ.

 # About this repository

--- a/sonarqube/README.md
+++ b/sonarqube/README.md
@ -1,9 +1,9 @@
 # Supported tags and respective `Dockerfile` links

-	[`latest`, `6.0` (*6.0/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/73534fd899d29eb1373ea073edbfe7a4074ede6e/6.0/Dockerfile)
-	[`lts`, `5.6.1` (*5.6.1/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/73534fd899d29eb1373ea073edbfe7a4074ede6e/5.6.1/Dockerfile)
-	[`alpine`, `6.0-alpine` (*6.0-alpine/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/73534fd899d29eb1373ea073edbfe7a4074ede6e/6.0-alpine/Dockerfile)
-	[`lts-alpine`, `5.6.1-alpine` (*5.6.1-alpine/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/73534fd899d29eb1373ea073edbfe7a4074ede6e/5.6.1-alpine/Dockerfile)
+-	[`latest`, `6.0` (*6.0/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/84a3016c3c8565764cec7cdb024e39de70817481/6.0/Dockerfile)
+-	[`lts`, `5.6.2` (*5.6.2/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/84a3016c3c8565764cec7cdb024e39de70817481/5.6.2/Dockerfile)
+-	[`alpine`, `6.0-alpine` (*6.0-alpine/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/84a3016c3c8565764cec7cdb024e39de70817481/6.0-alpine/Dockerfile)
+-	[`lts-alpine`, `5.6.2-alpine` (*5.6.2-alpine/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/84a3016c3c8565764cec7cdb024e39de70817481/5.6.2-alpine/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/sonarqube`)](https://github.com/docker-library/official-images/blob/master/library/sonarqube). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fsonarqube).

--- a/telegraf/README.md
+++ b/telegraf/README.md
@ -1,10 +1,9 @@
 # Supported tags and respective `Dockerfile` links

-	[`0.12`, `0.12.0` (*0.12/Dockerfile*)](https://github.com/influxdata/telegraf-docker/blob/9f5442edabacd2a72627246e7ee8c7d276bd0f28/0.12/Dockerfile)
-	[`0.13`, `0.13.1`, `latest` (*telegraf/0.13/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/22b661b4c141d237669f94e4740f234b7be43a7b/telegraf/0.13/Dockerfile)
-	[`0.13-alpine`, `0.13.1-alpine`, `alpine` (*telegraf/0.13/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/22b661b4c141d237669f94e4740f234b7be43a7b/telegraf/0.13/alpine/Dockerfile)
-	[`1.0.0-rc1` (*telegraf/1.0/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/22b661b4c141d237669f94e4740f234b7be43a7b/telegraf/1.0/Dockerfile)
-	[`1.0.0-rc1-alpine` (*telegraf/1.0/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/22b661b4c141d237669f94e4740f234b7be43a7b/telegraf/1.0/alpine/Dockerfile)
+-	[`0.13`, `0.13.1` (*telegraf/0.13/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/ec08f02c8a4a15bcea2a6c46517eceb9284633a2/telegraf/0.13/Dockerfile)
+-	[`0.13-alpine`, `0.13.1-alpine` (*telegraf/0.13/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/ec08f02c8a4a15bcea2a6c46517eceb9284633a2/telegraf/0.13/alpine/Dockerfile)
+-	[`1.0`, `1.0.1`, `latest` (*telegraf/1.0/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/a86d1ecbaa12a696c10ed66bf4390c42fe733582/telegraf/1.0/Dockerfile)
+-	[`1.0-alpine`, `1.0.1-alpine`, `alpine` (*telegraf/1.0/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/a86d1ecbaa12a696c10ed66bf4390c42fe733582/telegraf/1.0/alpine/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/telegraf`)](https://github.com/docker-library/official-images/blob/master/library/telegraf). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Ftelegraf).

--- a/tomcat/README.md
+++ b/tomcat/README.md
@ -1,19 +1,19 @@
 # Supported tags and respective `Dockerfile` links

-	[`6.0.45-jre7`, `6.0-jre7`, `6-jre7`, `6.0.45`, `6.0`, `6` (*6/jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/6/jre7/Dockerfile)
-	[`6.0.45-jre8`, `6.0-jre8`, `6-jre8` (*6/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/6/jre8/Dockerfile)
-	[`7.0.70-jre7`, `7.0-jre7`, `7-jre7`, `7.0.70`, `7.0`, `7` (*7/jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/7/jre7/Dockerfile)
-	[`7.0.70-jre7-alpine`, `7.0-jre7-alpine`, `7-jre7-alpine`, `7.0.70-alpine`, `7.0-alpine`, `7-alpine` (*7/jre7-alpine/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/7/jre7-alpine/Dockerfile)
-	[`7.0.70-jre8`, `7.0-jre8`, `7-jre8` (*7/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/7/jre8/Dockerfile)
-	[`7.0.70-jre8-alpine`, `7.0-jre8-alpine`, `7-jre8-alpine` (*7/jre8-alpine/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/7/jre8-alpine/Dockerfile)
-	[`8.0.36-jre7`, `8.0-jre7`, `8-jre7`, `jre7`, `8.0.36`, `8.0`, `8`, `latest` (*8.0/jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/8.0/jre7/Dockerfile)
-	[`8.0.36-jre7-alpine`, `8.0-jre7-alpine`, `8-jre7-alpine`, `jre7-alpine`, `8.0.36-alpine`, `8.0-alpine`, `8-alpine`, `alpine` (*8.0/jre7-alpine/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/8.0/jre7-alpine/Dockerfile)
-	[`8.0.36-jre8`, `8.0-jre8`, `8-jre8`, `jre8` (*8.0/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/8.0/jre8/Dockerfile)
-	[`8.0.36-jre8-alpine`, `8.0-jre8-alpine`, `8-jre8-alpine`, `jre8-alpine` (*8.0/jre8-alpine/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/8.0/jre8-alpine/Dockerfile)
-	[`8.5.4-jre8`, `8.5-jre8`, `8.5.4`, `8.5` (*8.5/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/8.5/jre8/Dockerfile)
-	[`8.5.4-jre8-alpine`, `8.5-jre8-alpine`, `8.5.4-alpine`, `8.5-alpine` (*8.5/jre8-alpine/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/8.5/jre8-alpine/Dockerfile)
-	[`9.0.0.M9-jre8`, `9.0.0-jre8`, `9.0-jre8`, `9-jre8`, `9.0.0.M9`, `9.0.0`, `9.0`, `9` (*9.0/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/9.0/jre8/Dockerfile)
-	[`9.0.0.M9-jre8-alpine`, `9.0.0-jre8-alpine`, `9.0-jre8-alpine`, `9-jre8-alpine`, `9.0.0.M9-alpine`, `9.0.0-alpine`, `9.0-alpine`, `9-alpine` (*9.0/jre8-alpine/Dockerfile*)](https://github.com/docker-library/tomcat/blob/989f50ed5db788921a4954109b90362e2209295e/9.0/jre8-alpine/Dockerfile)
+-	[`6.0.45-jre7`, `6.0-jre7`, `6-jre7`, `6.0.45`, `6.0`, `6` (*6/jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/6/jre7/Dockerfile)
+-	[`6.0.45-jre8`, `6.0-jre8`, `6-jre8` (*6/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/6/jre8/Dockerfile)
+-	[`7.0.72-jre7`, `7.0-jre7`, `7-jre7`, `7.0.72`, `7.0`, `7` (*7/jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/7/jre7/Dockerfile)
+-	[`7.0.72-jre7-alpine`, `7.0-jre7-alpine`, `7-jre7-alpine`, `7.0.72-alpine`, `7.0-alpine`, `7-alpine` (*7/jre7-alpine/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/7/jre7-alpine/Dockerfile)
+-	[`7.0.72-jre8`, `7.0-jre8`, `7-jre8` (*7/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/7/jre8/Dockerfile)
+-	[`7.0.72-jre8-alpine`, `7.0-jre8-alpine`, `7-jre8-alpine` (*7/jre8-alpine/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/7/jre8-alpine/Dockerfile)
+-	[`8.0.37-jre7`, `8.0-jre7`, `8-jre7`, `jre7`, `8.0.37`, `8.0`, `8`, `latest` (*8.0/jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/8.0/jre7/Dockerfile)
+-	[`8.0.37-jre7-alpine`, `8.0-jre7-alpine`, `8-jre7-alpine`, `jre7-alpine`, `8.0.37-alpine`, `8.0-alpine`, `8-alpine`, `alpine` (*8.0/jre7-alpine/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/8.0/jre7-alpine/Dockerfile)
+-	[`8.0.37-jre8`, `8.0-jre8`, `8-jre8`, `jre8` (*8.0/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/8.0/jre8/Dockerfile)
+-	[`8.0.37-jre8-alpine`, `8.0-jre8-alpine`, `8-jre8-alpine`, `jre8-alpine` (*8.0/jre8-alpine/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/8.0/jre8-alpine/Dockerfile)
+-	[`8.5.5-jre8`, `8.5-jre8`, `8.5.5`, `8.5` (*8.5/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/8.5/jre8/Dockerfile)
+-	[`8.5.5-jre8-alpine`, `8.5-jre8-alpine`, `8.5.5-alpine`, `8.5-alpine` (*8.5/jre8-alpine/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/8.5/jre8-alpine/Dockerfile)
+-	[`9.0.0.M10-jre8`, `9.0.0-jre8`, `9.0-jre8`, `9-jre8`, `9.0.0.M10`, `9.0.0`, `9.0`, `9` (*9.0/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/9.0/jre8/Dockerfile)
+-	[`9.0.0.M10-jre8-alpine`, `9.0.0-jre8-alpine`, `9.0-jre8-alpine`, `9-jre8-alpine`, `9.0.0.M10-alpine`, `9.0.0-alpine`, `9.0-alpine`, `9-alpine` (*9.0/jre8-alpine/Dockerfile*)](https://github.com/docker-library/tomcat/blob/81c66e2e695ad5548b726841c00512a9acf18eb5/9.0/jre8-alpine/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/tomcat`)](https://github.com/docker-library/official-images/blob/master/library/tomcat). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Ftomcat).

--- a/traefik/README.md
+++ b/traefik/README.md
@ -1,6 +1,7 @@
 # Supported tags and respective `Dockerfile` links

-	[`v1.0.2`, `reblochon`, `latest` (*Dockerfile*)](https://github.com/containous/traefik-library-image/blob/d196677d04b5bc804dbc3c264ac5be664601d6a3/Dockerfile)
+-	[`v1.1.0-rc1`, `camembert` (*Dockerfile*)](https://github.com/containous/traefik-library-image/blob/ac09f6208236a539d67c076ae25354d884ad5be7/Dockerfile)
+-	[`v1.0.3`, `reblochon`, `latest` (*Dockerfile*)](https://github.com/containous/traefik-library-image/blob/9d877ca7171211aabc2955ab1a301a685f6852fe/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/traefik`)](https://github.com/docker-library/official-images/blob/master/library/traefik). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Ftraefik).

--- a/ubuntu/README.md
+++ b/ubuntu/README.md
@ -1,9 +1,9 @@
 # Supported tags and respective `Dockerfile` links

-	[`12.04.5`, `12.04`, `precise-20160819`, `precise` (*precise/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/aec74cf404240664b289d28948d9284a4afd1181/precise/Dockerfile)
-	[`14.04.5`, `14.04`, `trusty-20160819`, `trusty` (*trusty/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/aec74cf404240664b289d28948d9284a4afd1181/trusty/Dockerfile)
-	[`16.04`, `xenial-20160818`, `xenial`, `latest` (*xenial/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/aec74cf404240664b289d28948d9284a4afd1181/xenial/Dockerfile)
-	[`16.10`, `yakkety-20160826`, `yakkety`, `devel` (*yakkety/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/aec74cf404240664b289d28948d9284a4afd1181/yakkety/Dockerfile)
+-	[`12.04.5`, `12.04`, `precise-20160923.1`, `precise` (*precise/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/50cfe3fd07327a05e449574f0ece07a6e0bb0c76/precise/Dockerfile)
+-	[`14.04.5`, `14.04`, `trusty-20160923.1`, `trusty` (*trusty/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/50cfe3fd07327a05e449574f0ece07a6e0bb0c76/trusty/Dockerfile)
+-	[`16.04`, `xenial-20160923.1`, `xenial`, `latest` (*xenial/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/50cfe3fd07327a05e449574f0ece07a6e0bb0c76/xenial/Dockerfile)
+-	[`16.10`, `yakkety-20160923.1`, `yakkety`, `devel` (*yakkety/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/50cfe3fd07327a05e449574f0ece07a6e0bb0c76/yakkety/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/ubuntu`)](https://github.com/docker-library/official-images/blob/master/library/ubuntu). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fubuntu).

--- a/websphere-liberty/README.md
+++ b/websphere-liberty/README.md
@ -1,10 +1,11 @@
 # Supported tags and respective `Dockerfile` links

-	[`kernel` (*ga/developer/kernel/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/0c0fa33fabbbf0a9be57df2b2940c5e6c9603e6f/ga/developer/kernel/Dockerfile)
-	[`webProfile6` (*ga/developer/webProfile6/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/0c0fa33fabbbf0a9be57df2b2940c5e6c9603e6f/ga/developer/webProfile6/Dockerfile)
-	[`webProfile7` (*ga/developer/webProfile7/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/0c0fa33fabbbf0a9be57df2b2940c5e6c9603e6f/ga/developer/webProfile7/Dockerfile)
-	[`javaee7`, `latest` (*ga/developer/javaee7/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/0c0fa33fabbbf0a9be57df2b2940c5e6c9603e6f/ga/developer/javaee7/Dockerfile)
-	[`beta` (*beta/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/bdff1b69435c9d9ff2799a8e9e4aa07c0138786d/beta/Dockerfile)
+-	[`kernel` (*ga/developer/kernel/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/b50db5440367cae75862a718d92f3b460a458a24/ga/developer/kernel/Dockerfile)
+-	[`microProfile` (*ga/developer/microProfile/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/b50db5440367cae75862a718d92f3b460a458a24/ga/developer/microProfile/Dockerfile)
+-	[`webProfile6` (*ga/developer/webProfile6/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/b50db5440367cae75862a718d92f3b460a458a24/ga/developer/webProfile6/Dockerfile)
+-	[`webProfile7` (*ga/developer/webProfile7/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/b50db5440367cae75862a718d92f3b460a458a24/ga/developer/webProfile7/Dockerfile)
+-	[`javaee7`, `latest` (*ga/developer/javaee7/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/b50db5440367cae75862a718d92f3b460a458a24/ga/developer/javaee7/Dockerfile)
+-	[`beta` (*beta/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/0b36208258a0c0df3c2355045278c780fa4211ca/beta/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/websphere-liberty`)](https://github.com/docker-library/official-images/blob/master/library/websphere-liberty). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fwebsphere-liberty).

--- a/wordpress/README.md
+++ b/wordpress/README.md
@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links

-	[`4.6.0-apache`, `4.6-apache`, `4-apache`, `apache`, `4.6.0`, `4.6`, `4`, `latest` (*apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/40d7cd3ef5f806a9c74243141b51c590c632af40/apache/Dockerfile)
-	[`4.6.0-fpm`, `4.6-fpm`, `4-fpm`, `fpm` (*fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/40d7cd3ef5f806a9c74243141b51c590c632af40/fpm/Dockerfile)
+-	[`4.6.1-apache`, `4.6-apache`, `4-apache`, `apache`, `4.6.1`, `4.6`, `4`, `latest` (*apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/d6294d103d2eb8d618dd09e28240ea2de2577c25/apache/Dockerfile)
+-	[`4.6.1-fpm`, `4.6-fpm`, `4-fpm`, `fpm` (*fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/d6294d103d2eb8d618dd09e28240ea2de2577c25/fpm/Dockerfile)

 For more information about this image and its history, please see [the relevant manifest file (`library/wordpress`)](https://github.com/docker-library/official-images/blob/master/library/wordpress). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fwordpress).

--- a/zookeeper/README-short.txt
+++ b/zookeeper/README-short.txt
@ -0,0 +1 @@
+Apache ZooKeeper is an open-source server which enables highly reliable distributed coordination.
--- a/zookeeper/README.md
+++ b/zookeeper/README.md
@ -0,0 +1,127 @@
+# Supported tags and respective `Dockerfile` links
+
+-	[`3.3.6`, `3.3` (*3.3.6/Dockerfile*)](https://github.com/31z4/zookeeper-docker/blob/05459469a865f17d961bd018a6dbfd46187fb6e8/3.3.6/Dockerfile)
+-	[`3.4.9`, `3.4`, `latest` (*3.4.9/Dockerfile*)](https://github.com/31z4/zookeeper-docker/blob/05459469a865f17d961bd018a6dbfd46187fb6e8/3.4.9/Dockerfile)
+
+For more information about this image and its history, please see [the relevant manifest file (`library/zookeeper`)](https://github.com/docker-library/official-images/blob/master/library/zookeeper). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fzookeeper).
+
+For detailed information about the virtual/transfer sizes and individual layers of each of the above supported tags, please see [the `repos/zookeeper/tag-details.md` file](https://github.com/docker-library/repo-info/blob/master/repos/zookeeper/tag-details.md) in [the `docker-library/repo-info` GitHub repo](https://github.com/docker-library/repo-info).
+
+# What is Apache Zookeeper?
+
+Apache ZooKeeper is a software project of the Apache Software Foundation, providing an open source distributed configuration service, synchronization service, and naming registry for large distributed systems. ZooKeeper was a sub-project of Hadoop but is now a top-level project in its own right.
+
+> [wikipedia.org/wiki/Apache_ZooKeeper](https://en.wikipedia.org/wiki/Apache_ZooKeeper)
+
+![logo](https://raw.githubusercontent.com/docker-library/docs/f906e95d1c27856aa79ea1bd8600da51466e7b0b/zookeeper/logo.png)
+
+# How to use this image
+
+## Start a Zookeeper server instance
+
+	$ docker run --name some-zookeeper --restart always -d zookeeper
+
+This image includes `EXPOSE 2181` (the zookeeper port), so standard container linking will make it automatically available to the linked containers. Since the Zookeeper "fails fast" it's better to always restart it.
+
+## Connect to Zookeeper from an application in another Docker container
+
+	$ docker run --name some-app --link some-zookeeper:zookeeper -d application-that-uses-zookeeper
+
+## Connect to Zookeeper from the Zookeeper command line client
+
+	$ docker run -it --rm --link some-zookeeper:zookeeper zookeeper zkCli.sh -server zookeeper
+
+## ... via [`docker-compose`](https://github.com/docker/compose)
+
+Example `docker-compose.yml` for `zookeeper`:
+
+```yaml
+version: '2'
+services:
+    zoo1:
+        image: zookeeper
+        restart: always
+        ports:
+            - 2181
+        environment:
+            ZOO_MY_ID: 1
+            ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
+
+    zoo2:
+        image: zookeeper
+        restart: always
+        ports:
+            - 2181
+        environment:
+            ZOO_MY_ID: 2
+            ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
+
+    zoo3:
+        image: zookeeper
+        restart: always
+        ports:
+            - 2181
+        environment:
+            ZOO_MY_ID: 3
+            ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
+```
+
+This will start Zookeeper in [replicated mode](http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_RunningReplicatedZooKeeper). Run `docker-compose up` and wait for it to initialize completely. Run `docker-compose ps` to figure out exposed ports.
+
+> Please be aware that setting up multiple servers on a single machine will not create any redundancy. If something were to happen which caused the machine to die, all of the zookeeper servers would be offline. Full redundancy requires that each server have its own machine. It must be a completely separate physical server. Multiple virtual machines on the same physical host are still vulnerable to the complete failure of that host.
+
+Consider using [Docker Swarm](https://www.docker.com/products/docker-swarm) when running Zookeeper in replicated mode.
+
+## Configuration
+
+Zookeeper configuration is located in `/conf`. One way to change it is mounting your config file as a volume:
+
+	$ docker run --name some-zookeeper --restart always -d -v $(pwd)/zoo.cfg:/conf/zoo.cfg zookeeper
+
+## Environment variables
+
+Variables below are mandatory if you want to run Zookeeper in replicated mode.
+
+### `ZOO_MY_ID`
+
+The id must be unique within the ensemble and should have a value between 1 and 255. Do note that this variable will not have any effect if you start the container with a `/data` directory that already contains the `myid` file.
+
+### `ZOO_SERVERS`
+
+This variable allows you to specify a list of machines of the Zookeeper ensemble. Each entry has the form of `server.id=host:port:port`. Entries are separated with space. Do note that this variable will not have any effect if you start the container with a `/conf` directory that already contains the `zoo.cfg` file.
+
+## Where to store data
+
+This image is configured with volumes at `/data` and `/datalog` to hold the Zookeeper in-memory database snapshots and the transaction log of updates to the database, respectively.
+
+> Be careful where you put the transaction log. A dedicated transaction log device is key to consistent good performance. Putting the log on a busy device will adversely effect performance.
+
+# License
+
+View [license information](https://github.com/apache/zookeeper/blob/release-3.4.9/LICENSE.txt) for the software contained in this image.
+
+# Supported Docker versions
+
+This image is officially supported on Docker version 1.12.1.
+
+Support for older versions (down to 1.6) is provided on a best-effort basis.
+
+Please see [the Docker installation documentation](https://docs.docker.com/installation/) for details on how to upgrade your Docker daemon.
+
+# User Feedback
+
+## Documentation
+
+Documentation for this image is stored in the [`zookeeper/` directory](https://github.com/docker-library/docs/tree/master/zookeeper) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
+
+## Issues
+
+If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/31z4/zookeeper-docker/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
+
+You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
+
+## Contributing
+
+You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
+
+Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/31z4/zookeeper-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
--- a/zookeeper/content.md
+++ b/zookeeper/content.md
@ -0,0 +1,55 @@
+# What is Apache Zookeeper?
+
+Apache ZooKeeper is a software project of the Apache Software Foundation, providing an open source distributed configuration service, synchronization service, and naming registry for large distributed systems. ZooKeeper was a sub-project of Hadoop but is now a top-level project in its own right.
+
+> [wikipedia.org/wiki/Apache_ZooKeeper](https://en.wikipedia.org/wiki/Apache_ZooKeeper)
+
+%%LOGO%%
+
+# How to use this image
+
+## Start a Zookeeper server instance
+
+	$ docker run --name some-zookeeper --restart always -d zookeeper
+
+This image includes `EXPOSE 2181` (the zookeeper port), so standard container linking will make it automatically available to the linked containers. Since the Zookeeper "fails fast" it's better to always restart it.
+
+## Connect to Zookeeper from an application in another Docker container
+
+	$ docker run --name some-app --link some-zookeeper:zookeeper -d application-that-uses-zookeeper
+
+## Connect to Zookeeper from the Zookeeper command line client
+
+	$ docker run -it --rm --link some-zookeeper:zookeeper zookeeper zkCli.sh -server zookeeper
+
+## %%COMPOSE%%
+
+This will start Zookeeper in [replicated mode](http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_RunningReplicatedZooKeeper). Run `docker-compose up` and wait for it to initialize completely. Run `docker-compose ps` to figure out exposed ports.
+
+> Please be aware that setting up multiple servers on a single machine will not create any redundancy. If something were to happen which caused the machine to die, all of the zookeeper servers would be offline. Full redundancy requires that each server have its own machine. It must be a completely separate physical server. Multiple virtual machines on the same physical host are still vulnerable to the complete failure of that host.
+
+Consider using [Docker Swarm](https://www.docker.com/products/docker-swarm) when running Zookeeper in replicated mode.
+
+## Configuration
+
+Zookeeper configuration is located in `/conf`. One way to change it is mounting your config file as a volume:
+
+	$ docker run --name some-zookeeper --restart always -d -v $(pwd)/zoo.cfg:/conf/zoo.cfg zookeeper
+
+## Environment variables
+
+Variables below are mandatory if you want to run Zookeeper in replicated mode.
+
+### `ZOO_MY_ID`
+
+The id must be unique within the ensemble and should have a value between 1 and 255. Do note that this variable will not have any effect if you start the container with a `/data` directory that already contains the `myid` file.
+
+### `ZOO_SERVERS`
+
+This variable allows you to specify a list of machines of the Zookeeper ensemble. Each entry has the form of `server.id=host:port:port`. Entries are separated with space. Do note that this variable will not have any effect if you start the container with a `/conf` directory that already contains the `zoo.cfg` file.
+
+## Where to store data
+
+This image is configured with volumes at `/data` and `/datalog` to hold the Zookeeper in-memory database snapshots and the transaction log of updates to the database, respectively.
+
+> Be careful where you put the transaction log. A dedicated transaction log device is key to consistent good performance. Putting the log on a busy device will adversely effect performance.
--- a/zookeeper/docker-compose.yml
+++ b/zookeeper/docker-compose.yml
@ -0,0 +1,28 @@
+version: '2'
+services:
+    zoo1:
+        image: zookeeper
+        restart: always
+        ports:
+            - 2181
+        environment:
+            ZOO_MY_ID: 1
+            ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
+
+    zoo2:
+        image: zookeeper
+        restart: always
+        ports:
+            - 2181
+        environment:
+            ZOO_MY_ID: 2
+            ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
+
+    zoo3:
+        image: zookeeper
+        restart: always
+        ports:
+            - 2181
+        environment:
+            ZOO_MY_ID: 3
+            ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
--- a/zookeeper/github-repo
+++ b/zookeeper/github-repo
@ -0,0 +1 @@
+https://github.com/31z4/zookeeper-docker
--- a/zookeeper/license.md
+++ b/zookeeper/license.md
@ -0,0 +1 @@
+View [license information](https://github.com/apache/zookeeper/blob/release-3.4.9/LICENSE.txt) for the software contained in this image.
--- a/zookeeper/logo.png
+++ b/zookeeper/logo.png
				`@ -0,0 +1 @@`
				`NATS Streaming is an open-source, high-performance, cloud native messaging streaming system.`
				`@ -0,0 +1 @@`
				`https://github.com/nats-io/nats-streaming-docker`
				`@ -0,0 +1 @@`
				`View [license information](https://github.com/nats-io/nats-streaming-server/blob/master/LICENSE) for the software contained in this image.`
				`@ -0,0 +1 @@`
				`Apache ZooKeeper is an open-source server which enables highly reliable distributed coordination.`