From 8ccd997a1b3f6846d9048bd16ca049c6c84c5308 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 9 Jun 2016 14:46:38 -0700 Subject: [PATCH] Run update.sh --- django/README.md | 22 +++------------------- drupal/README.md | 6 +++--- haproxy/README.md | 16 ---------------- hylang/README.md | 2 +- java/README.md | 16 ---------------- julia/README.md | 2 +- mysql/README.md | 6 +++--- owncloud/README.md | 10 +++++----- percona/README.md | 6 +++--- php/README.md | 46 +++++++++++++++------------------------------ postgres/README.md | 12 ++++++------ pypy/README.md | 26 +++---------------------- python/README.md | 38 +++++-------------------------------- rabbitmq/README.md | 2 +- rails/README.md | 16 ---------------- redis/README.md | 16 ---------------- ruby/README.md | 36 ++++------------------------------- tomcat/README.md | 4 ++-- wordpress/README.md | 2 +- 19 files changed, 56 insertions(+), 228 deletions(-) diff --git a/django/README.md b/django/README.md index 186633810..325307a7f 100644 --- a/django/README.md +++ b/django/README.md @@ -1,11 +1,11 @@ # Supported tags and respective `Dockerfile` links +- [`1.9.7-python3`, `1.9-python3`, `1-python3`, `python3`, `1.9.7`, `1.9`, `1`, `latest` (*3.4/Dockerfile*)](https://github.com/docker-library/django/blob/819c332058c3638ab8f4fa5b9f70518e9aaf6325/3.4/Dockerfile) +- [`python3-onbuild`, `onbuild` (*3.4/onbuild/Dockerfile*)](https://github.com/docker-library/django/blob/cecbb2bbbcb69d1b8358398eaf8d9638e3bdd447/3.4/onbuild/Dockerfile) - [`1.9.7-python2`, `1.9-python2`, `1-python2`, `python2` (*2.7/Dockerfile*)](https://github.com/docker-library/django/blob/819c332058c3638ab8f4fa5b9f70518e9aaf6325/2.7/Dockerfile) - [`python2-onbuild` (*2.7/onbuild/Dockerfile*)](https://github.com/docker-library/django/blob/cecbb2bbbcb69d1b8358398eaf8d9638e3bdd447/2.7/onbuild/Dockerfile) -- [`1.9.7-python3`, `1.9.7`, `1.9-python3`, `1.9`, `1-python3`, `1`, `python3`, `latest` (*3.4/Dockerfile*)](https://github.com/docker-library/django/blob/819c332058c3638ab8f4fa5b9f70518e9aaf6325/3.4/Dockerfile) -- [`python3-onbuild`, `onbuild` (*3.4/onbuild/Dockerfile*)](https://github.com/docker-library/django/blob/cecbb2bbbcb69d1b8358398eaf8d9638e3bdd447/3.4/onbuild/Dockerfile) -[![](https://badge.imagelayers.io/django:latest.svg)](https://imagelayers.io/?images=django:1.9.7-python2,django:python2-onbuild,django:1.9.7-python3,django:python3-onbuild) +[![](https://badge.imagelayers.io/django:latest.svg)](https://imagelayers.io/?images=django:1.9.7-python3,django:python3-onbuild,django:1.9.7-python2,django:python2-onbuild) 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). @@ -62,22 +62,6 @@ $ docker run -it --rm --user "$(id -u):$(id -g)" -v "$PWD":/usr/src/app -w /usr/ This will create a sub-directory named `mysite` inside your current directory. -# Image Variants - -The `django` images come in many flavors, each designed for a specific use case. - -## `django:` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `django:onbuild` - -This image makes building derivative images easier. For most use cases, creating a `Dockerfile` in the base of your project directory with the line `FROM django:onbuild` will be enough to create a stand-alone image for your project. - -While the `onbuild` variant is really useful for "getting off the ground running" (zero to Dockerized in a short period of time), it's not recommended for long-term usage within a project due to the lack of control over *when* the `ONBUILD` triggers fire (see also [`docker/docker#5714`](https://github.com/docker/docker/issues/5714), [`docker/docker#8240`](https://github.com/docker/docker/issues/8240), [`docker/docker#11917`](https://github.com/docker/docker/issues/11917)). - -Once you've got a handle on how your project functions within Docker, you'll probably want to adjust your `Dockerfile` to inherit from a non-`onbuild` variant and copy the commands from the `onbuild` variant `Dockerfile` (moving the `ONBUILD` lines to the end and removing the `ONBUILD` keywords) into your own file so that you have tighter control over them and more transparency for yourself and others looking at your `Dockerfile` as to what it does. This also makes it easier to add additional requirements as time goes on (such as installing more packages before performing the previously-`ONBUILD` steps). - # License View [license information](https://github.com/django/django/blob/master/LICENSE) for the software contained in this image. diff --git a/drupal/README.md b/drupal/README.md index e49f6c58a..b52c26952 100644 --- a/drupal/README.md +++ b/drupal/README.md @@ -1,10 +1,10 @@ # Supported tags and respective `Dockerfile` links -- [`7.43-apache`, `7.43`, `7-apache`, `7` (*7/apache/Dockerfile*)](https://github.com/docker-library/drupal/blob/865f61938fe7f37359d8feeb13bb03bff8f11387/7/apache/Dockerfile) +- [`7.43-apache`, `7-apache`, `7.43`, `7` (*7/apache/Dockerfile*)](https://github.com/docker-library/drupal/blob/865f61938fe7f37359d8feeb13bb03bff8f11387/7/apache/Dockerfile) - [`7.43-fpm`, `7-fpm` (*7/fpm/Dockerfile*)](https://github.com/docker-library/drupal/blob/865f61938fe7f37359d8feeb13bb03bff8f11387/7/fpm/Dockerfile) -- [`8.0.6-apache`, `8.0.6`, `8.0-apache`, `8.0` (*8.0/apache/Dockerfile*)](https://github.com/docker-library/drupal/blob/54f9aa4a327fd221cacf2f59b71682ca4004d231/8.0/apache/Dockerfile) +- [`8.0.6-apache`, `8.0-apache`, `8.0.6`, `8.0` (*8.0/apache/Dockerfile*)](https://github.com/docker-library/drupal/blob/54f9aa4a327fd221cacf2f59b71682ca4004d231/8.0/apache/Dockerfile) - [`8.0.6-fpm`, `8.0-fpm` (*8.0/fpm/Dockerfile*)](https://github.com/docker-library/drupal/blob/280071cdbb819aae47263463a32bf217741f2a0f/8.0/fpm/Dockerfile) -- [`8.1.2-apache`, `8.1.2`, `8.1-apache`, `8.1`, `8-apache`, `8`, `apache`, `latest` (*8.1/apache/Dockerfile*)](https://github.com/docker-library/drupal/blob/2186f092b0f2547063cfee95e7e0f54565a2cd76/8.1/apache/Dockerfile) +- [`8.1.2-apache`, `8.1-apache`, `8-apache`, `apache`, `8.1.2`, `8.1`, `8`, `latest` (*8.1/apache/Dockerfile*)](https://github.com/docker-library/drupal/blob/2186f092b0f2547063cfee95e7e0f54565a2cd76/8.1/apache/Dockerfile) - [`8.1.2-fpm`, `8.1-fpm`, `8-fpm`, `fpm` (*8.1/fpm/Dockerfile*)](https://github.com/docker-library/drupal/blob/2186f092b0f2547063cfee95e7e0f54565a2cd76/8.1/fpm/Dockerfile) [![](https://badge.imagelayers.io/drupal:latest.svg)](https://imagelayers.io/?images=drupal:7.43-apache,drupal:7.43-fpm,drupal:8.0.6-apache,drupal:8.0.6-fpm,drupal:8.1.2-apache,drupal:8.1.2-fpm) diff --git a/haproxy/README.md b/haproxy/README.md index 32d81d292..02adaf4b3 100644 --- a/haproxy/README.md +++ b/haproxy/README.md @@ -72,22 +72,6 @@ $ docker kill -s HUP my-running-haproxy The entrypoint script in the image checks for running the command `haproxy` and replaces it with `haproxy-systemd-wrapper` from haproxy upstream which takes care of signal handling to do the graceful reload. Under the hood this uses the `-sf` option of haproxy so "there are two small windows of a few milliseconds each where it is possible that a few connection failures will be noticed during high loads" (see [Stopping and restarting HAProxy](http://www.haproxy.org/download/1.6/doc/management.txt)). -# Image Variants - -The `haproxy` images come in many flavors, each designed for a specific use case. - -## `haproxy:` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `haproxy:alpine` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - # License View [license information](http://www.haproxy.org/download/1.5/doc/LICENSE) for the software contained in this image. diff --git a/hylang/README.md b/hylang/README.md index 5263bb4fa..183105ca2 100644 --- a/hylang/README.md +++ b/hylang/README.md @@ -1,6 +1,6 @@ # Supported tags and respective `Dockerfile` links -- [`0.11.1`, `0.11`, `latest` (*Dockerfile*)](https://github.com/hylang/hy/blob/54b13955d1f98f8a7d835a4ed8f452bb9f1135bc/Dockerfile) +- [`0.11.1`, `0.11`, `0`, `latest` (*Dockerfile*)](https://github.com/hylang/hy/blob/54b13955d1f98f8a7d835a4ed8f452bb9f1135bc/Dockerfile) [![](https://badge.imagelayers.io/hylang:latest.svg)](https://imagelayers.io/?images=hylang:0.11.1) diff --git a/java/README.md b/java/README.md index 92bdfa1e4..c22d42ce8 100644 --- a/java/README.md +++ b/java/README.md @@ -71,22 +71,6 @@ As all of the major upstream Linux distributions are unwilling to redistribute O - CentOS requires users to go and download the rpm provided by Oracle at java.com and thus accept the Oracle license ([wiki.centos.org](https://wiki.centos.org/HowTos/JavaRuntimeEnvironment)). - RedHat provides instructions to add a repo that is maintained by Oracle ([access.redhat.com](https://access.redhat.com/solutions/732883)). -# Image Variants - -The `java` images come in many flavors, each designed for a specific use case. - -## `java:` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. This tag is based off of [`buildpack-deps`](https://registry.hub.docker.com/_/buildpack-deps/). `buildpack-deps` is designed for the average user of docker who has many images on their system. It, by design, has a large number of extremely common Debian packages. This reduces the number of packages that images that derive from it need to install, thus reducing the overall size of all images on your system. - -## `java:alpine` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - # License View [license information](http://openjdk.java.net/legal/gplv2+ce.html) for the software contained in this image. diff --git a/julia/README.md b/julia/README.md index 6efb226c6..3f2f50277 100644 --- a/julia/README.md +++ b/julia/README.md @@ -1,6 +1,6 @@ # Supported tags and respective `Dockerfile` links -- [`0.4.5`, `0.4`, `latest` (*Dockerfile*)](https://github.com/docker-library/julia/blob/2bb511d3378dec17ebbf417d5865ede353ba8e57/Dockerfile) +- [`0.4.5`, `0.4`, `0`, `latest` (*Dockerfile*)](https://github.com/docker-library/julia/blob/2bb511d3378dec17ebbf417d5865ede353ba8e57/Dockerfile) [![](https://badge.imagelayers.io/julia:latest.svg)](https://imagelayers.io/?images=julia:0.4.5) diff --git a/mysql/README.md b/mysql/README.md index 0e78cf6c0..54cfe6d78 100644 --- a/mysql/README.md +++ b/mysql/README.md @@ -1,10 +1,10 @@ # Supported tags and respective `Dockerfile` links -- [`5.5.50`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/mysql/blob/f7a67d7634a68d319988ad6f99729bfeaa84ceb2/5.5/Dockerfile) -- [`5.6.31`, `5.6` (*5.6/Dockerfile*)](https://github.com/docker-library/mysql/blob/f7a67d7634a68d319988ad6f99729bfeaa84ceb2/5.6/Dockerfile) - [`5.7.13`, `5.7`, `5`, `latest` (*5.7/Dockerfile*)](https://github.com/docker-library/mysql/blob/f7a67d7634a68d319988ad6f99729bfeaa84ceb2/5.7/Dockerfile) +- [`5.6.31`, `5.6` (*5.6/Dockerfile*)](https://github.com/docker-library/mysql/blob/f7a67d7634a68d319988ad6f99729bfeaa84ceb2/5.6/Dockerfile) +- [`5.5.50`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/mysql/blob/f7a67d7634a68d319988ad6f99729bfeaa84ceb2/5.5/Dockerfile) -[![](https://badge.imagelayers.io/mysql:latest.svg)](https://imagelayers.io/?images=mysql:5.5.50,mysql:5.6.31,mysql:5.7.13) +[![](https://badge.imagelayers.io/mysql:latest.svg)](https://imagelayers.io/?images=mysql:5.7.13,mysql:5.6.31,mysql:5.5.50) 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). diff --git a/owncloud/README.md b/owncloud/README.md index 166a5c0e7..ddaec9862 100644 --- a/owncloud/README.md +++ b/owncloud/README.md @@ -1,14 +1,14 @@ # Supported tags and respective `Dockerfile` links -- [`7.0.15-apache`, `7.0.15`, `7.0-apache`, `7.0`, `7-apache`, `7` (*7.0/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/e58cf3d60e84e8dd113337e4a4ab7e4cdb8805ff/7.0/apache/Dockerfile) +- [`7.0.15-apache`, `7.0-apache`, `7-apache`, `7.0.15`, `7.0`, `7` (*7.0/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/e58cf3d60e84e8dd113337e4a4ab7e4cdb8805ff/7.0/apache/Dockerfile) - [`7.0.15-fpm`, `7.0-fpm`, `7-fpm` (*7.0/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/e58cf3d60e84e8dd113337e4a4ab7e4cdb8805ff/7.0/fpm/Dockerfile) -- [`8.0.13-apache`, `8.0.13`, `8.0-apache`, `8.0` (*8.0/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/e58cf3d60e84e8dd113337e4a4ab7e4cdb8805ff/8.0/apache/Dockerfile) +- [`8.0.13-apache`, `8.0-apache`, `8.0.13`, `8.0` (*8.0/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/e58cf3d60e84e8dd113337e4a4ab7e4cdb8805ff/8.0/apache/Dockerfile) - [`8.0.13-fpm`, `8.0-fpm` (*8.0/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/e58cf3d60e84e8dd113337e4a4ab7e4cdb8805ff/8.0/fpm/Dockerfile) -- [`8.1.8-apache`, `8.1.8`, `8.1-apache`, `8.1` (*8.1/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/e58cf3d60e84e8dd113337e4a4ab7e4cdb8805ff/8.1/apache/Dockerfile) +- [`8.1.8-apache`, `8.1-apache`, `8.1.8`, `8.1` (*8.1/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/e58cf3d60e84e8dd113337e4a4ab7e4cdb8805ff/8.1/apache/Dockerfile) - [`8.1.8-fpm`, `8.1-fpm` (*8.1/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/e58cf3d60e84e8dd113337e4a4ab7e4cdb8805ff/8.1/fpm/Dockerfile) -- [`8.2.5-apache`, `8.2.5`, `8.2-apache`, `8.2`, `8-apache`, `8` (*8.2/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/e58cf3d60e84e8dd113337e4a4ab7e4cdb8805ff/8.2/apache/Dockerfile) +- [`8.2.5-apache`, `8.2-apache`, `8-apache`, `8.2.5`, `8.2`, `8` (*8.2/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/e58cf3d60e84e8dd113337e4a4ab7e4cdb8805ff/8.2/apache/Dockerfile) - [`8.2.5-fpm`, `8.2-fpm`, `8-fpm` (*8.2/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/e58cf3d60e84e8dd113337e4a4ab7e4cdb8805ff/8.2/fpm/Dockerfile) -- [`9.0.2-apache`, `9.0.2`, `9.0-apache`, `9.0`, `9-apache`, `9`, `apache`, `latest` (*9.0/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/903a0f09109ef1d94a9cd4895a859c880ab8d702/9.0/apache/Dockerfile) +- [`9.0.2-apache`, `9.0-apache`, `9-apache`, `apache`, `9.0.2`, `9.0`, `9`, `latest` (*9.0/apache/Dockerfile*)](https://github.com/docker-library/owncloud/blob/903a0f09109ef1d94a9cd4895a859c880ab8d702/9.0/apache/Dockerfile) - [`9.0.2-fpm`, `9.0-fpm`, `9-fpm`, `fpm` (*9.0/fpm/Dockerfile*)](https://github.com/docker-library/owncloud/blob/903a0f09109ef1d94a9cd4895a859c880ab8d702/9.0/fpm/Dockerfile) [![](https://badge.imagelayers.io/owncloud:latest.svg)](https://imagelayers.io/?images=owncloud:7.0.15-apache,owncloud:7.0.15-fpm,owncloud:8.0.13-apache,owncloud:8.0.13-fpm,owncloud:8.1.8-apache,owncloud:8.1.8-fpm,owncloud:8.2.5-apache,owncloud:8.2.5-fpm,owncloud:9.0.2-apache,owncloud:9.0.2-fpm) diff --git a/percona/README.md b/percona/README.md index ae8a45c86..640eb6d80 100644 --- a/percona/README.md +++ b/percona/README.md @@ -1,10 +1,10 @@ # Supported tags and respective `Dockerfile` links -- [`5.5.49`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/percona/blob/4501310f267a20434f10b28a8e1be660a3a09439/5.5/Dockerfile) -- [`5.6.30`, `5.6` (*5.6/Dockerfile*)](https://github.com/docker-library/percona/blob/5981db386679e99039de1104a28920939acf59fc/5.6/Dockerfile) - [`5.7.12`, `5.7`, `5`, `latest` (*5.7/Dockerfile*)](https://github.com/docker-library/percona/blob/340269718642a7acc4580e398121ba5462308730/5.7/Dockerfile) +- [`5.6.30`, `5.6` (*5.6/Dockerfile*)](https://github.com/docker-library/percona/blob/5981db386679e99039de1104a28920939acf59fc/5.6/Dockerfile) +- [`5.5.49`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/percona/blob/4501310f267a20434f10b28a8e1be660a3a09439/5.5/Dockerfile) -[![](https://badge.imagelayers.io/percona:latest.svg)](https://imagelayers.io/?images=percona:5.5.49,percona:5.6.30,percona:5.7.12) +[![](https://badge.imagelayers.io/percona:latest.svg)](https://imagelayers.io/?images=percona:5.7.12,percona:5.6.30,percona:5.5.49) 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). diff --git a/php/README.md b/php/README.md index 264b74bce..d8d2e118f 100644 --- a/php/README.md +++ b/php/README.md @@ -1,19 +1,5 @@ # Supported tags and respective `Dockerfile` links -- [`5.5.36-cli`, `5.5-cli`, `5.5.36`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.5/Dockerfile) -- [`5.5.36-alpine`, `5.5-alpine` (*5.5/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/5.5/alpine/Dockerfile) -- [`5.5.36-apache`, `5.5-apache` (*5.5/apache/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.5/apache/Dockerfile) -- [`5.5.36-fpm`, `5.5-fpm` (*5.5/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.5/fpm/Dockerfile) -- [`5.5.36-fpm-alpine`, `5.5-fpm-alpine` (*5.5/fpm/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/5.5/fpm/alpine/Dockerfile) -- [`5.5.36-zts`, `5.5-zts` (*5.5/zts/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.5/zts/Dockerfile) -- [`5.5.36-zts-alpine`, `5.5-zts-alpine` (*5.5/zts/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/5.5/zts/alpine/Dockerfile) -- [`5.6.22-cli`, `5.6-cli`, `5-cli`, `5.6.22`, `5.6`, `5` (*5.6/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.6/Dockerfile) -- [`5.6.22-alpine`, `5.6-alpine`, `5-alpine` (*5.6/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/5.6/alpine/Dockerfile) -- [`5.6.22-apache`, `5.6-apache`, `5-apache` (*5.6/apache/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.6/apache/Dockerfile) -- [`5.6.22-fpm`, `5.6-fpm`, `5-fpm` (*5.6/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.6/fpm/Dockerfile) -- [`5.6.22-fpm-alpine`, `5.6-fpm-alpine`, `5-fpm-alpine` (*5.6/fpm/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/5.6/fpm/alpine/Dockerfile) -- [`5.6.22-zts`, `5.6-zts`, `5-zts` (*5.6/zts/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.6/zts/Dockerfile) -- [`5.6.22-zts-alpine`, `5.6-zts-alpine`, `5-zts-alpine` (*5.6/zts/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/5.6/zts/alpine/Dockerfile) - [`7.0.7-cli`, `7.0-cli`, `7-cli`, `cli`, `7.0.7`, `7.0`, `7`, `latest` (*7.0/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/7.0/Dockerfile) - [`7.0.7-alpine`, `7.0-alpine`, `7-alpine`, `alpine` (*7.0/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/7.0/alpine/Dockerfile) - [`7.0.7-apache`, `7.0-apache`, `7-apache`, `apache` (*7.0/apache/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/7.0/apache/Dockerfile) @@ -21,8 +7,22 @@ - [`7.0.7-fpm-alpine`, `7.0-fpm-alpine`, `7-fpm-alpine`, `fpm-alpine` (*7.0/fpm/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/7.0/fpm/alpine/Dockerfile) - [`7.0.7-zts`, `7.0-zts`, `7-zts`, `zts` (*7.0/zts/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/7.0/zts/Dockerfile) - [`7.0.7-zts-alpine`, `7.0-zts-alpine`, `7-zts-alpine`, `zts-alpine` (*7.0/zts/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/7.0/zts/alpine/Dockerfile) +- [`5.6.22-cli`, `5.6-cli`, `5-cli`, `5.6.22`, `5.6`, `5` (*5.6/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.6/Dockerfile) +- [`5.6.22-alpine`, `5.6-alpine`, `5-alpine` (*5.6/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/5.6/alpine/Dockerfile) +- [`5.6.22-apache`, `5.6-apache`, `5-apache` (*5.6/apache/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.6/apache/Dockerfile) +- [`5.6.22-fpm`, `5.6-fpm`, `5-fpm` (*5.6/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.6/fpm/Dockerfile) +- [`5.6.22-fpm-alpine`, `5.6-fpm-alpine`, `5-fpm-alpine` (*5.6/fpm/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/5.6/fpm/alpine/Dockerfile) +- [`5.6.22-zts`, `5.6-zts`, `5-zts` (*5.6/zts/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.6/zts/Dockerfile) +- [`5.6.22-zts-alpine`, `5.6-zts-alpine`, `5-zts-alpine` (*5.6/zts/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/5.6/zts/alpine/Dockerfile) +- [`5.5.36-cli`, `5.5-cli`, `5.5.36`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.5/Dockerfile) +- [`5.5.36-alpine`, `5.5-alpine` (*5.5/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/5.5/alpine/Dockerfile) +- [`5.5.36-apache`, `5.5-apache` (*5.5/apache/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.5/apache/Dockerfile) +- [`5.5.36-fpm`, `5.5-fpm` (*5.5/fpm/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.5/fpm/Dockerfile) +- [`5.5.36-fpm-alpine`, `5.5-fpm-alpine` (*5.5/fpm/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/5.5/fpm/alpine/Dockerfile) +- [`5.5.36-zts`, `5.5-zts` (*5.5/zts/Dockerfile*)](https://github.com/docker-library/php/blob/81ceba13187f9488f1ab25683575ac1b62fea772/5.5/zts/Dockerfile) +- [`5.5.36-zts-alpine`, `5.5-zts-alpine` (*5.5/zts/alpine/Dockerfile*)](https://github.com/docker-library/php/blob/3099068733b51ad67ce19b49fc32d949cb432181/5.5/zts/alpine/Dockerfile) -[![](https://badge.imagelayers.io/php:latest.svg)](https://imagelayers.io/?images=php:5.5.36-cli,php:5.5.36-alpine,php:5.5.36-apache,php:5.5.36-fpm,php:5.5.36-fpm-alpine,php:5.5.36-zts,php:5.5.36-zts-alpine,php:5.6.22-cli,php:5.6.22-alpine,php:5.6.22-apache,php:5.6.22-fpm,php:5.6.22-fpm-alpine,php:5.6.22-zts,php:5.6.22-zts-alpine,php:7.0.7-cli,php:7.0.7-alpine,php:7.0.7-apache,php:7.0.7-fpm,php:7.0.7-fpm-alpine,php:7.0.7-zts,php:7.0.7-zts-alpine) +[![](https://badge.imagelayers.io/php:latest.svg)](https://imagelayers.io/?images=php:7.0.7-cli,php:7.0.7-alpine,php:7.0.7-apache,php:7.0.7-fpm,php:7.0.7-fpm-alpine,php:7.0.7-zts,php:7.0.7-zts-alpine,php:5.6.22-cli,php:5.6.22-alpine,php:5.6.22-apache,php:5.6.22-fpm,php:5.6.22-fpm-alpine,php:5.6.22-zts,php:5.6.22-zts-alpine,php:5.5.36-cli,php:5.5.36-alpine,php:5.5.36-apache,php:5.5.36-fpm,php:5.5.36-fpm-alpine,php:5.5.36-zts,php:5.5.36-zts-alpine) 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). @@ -156,22 +156,6 @@ If you don't want to include a `Dockerfile` in your project, it is sufficient to $ docker run -d -p 80:80 --name my-apache-php-app -v "$PWD":/var/www/html php:5.6-apache ``` -# Image Variants - -The `php` images come in many flavors, each designed for a specific use case. - -## `php:` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `php:alpine` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - # License View [license information](http://php.net/license/) for the software contained in this image. diff --git a/postgres/README.md b/postgres/README.md index 531c01077..2f5939c97 100644 --- a/postgres/README.md +++ b/postgres/README.md @@ -1,13 +1,13 @@ # Supported tags and respective `Dockerfile` links -- [`9.1.22`, `9.1` (*9.1/Dockerfile*)](https://github.com/docker-library/postgres/blob/04b1d366d51a942b88fff6c62943f92c7c38d9b6/9.1/Dockerfile) -- [`9.2.17`, `9.2` (*9.2/Dockerfile*)](https://github.com/docker-library/postgres/blob/04b1d366d51a942b88fff6c62943f92c7c38d9b6/9.2/Dockerfile) -- [`9.3.13`, `9.3` (*9.3/Dockerfile*)](https://github.com/docker-library/postgres/blob/04b1d366d51a942b88fff6c62943f92c7c38d9b6/9.3/Dockerfile) -- [`9.4.8`, `9.4` (*9.4/Dockerfile*)](https://github.com/docker-library/postgres/blob/04b1d366d51a942b88fff6c62943f92c7c38d9b6/9.4/Dockerfile) -- [`9.5.3`, `9.5`, `9`, `latest` (*9.5/Dockerfile*)](https://github.com/docker-library/postgres/blob/04b1d366d51a942b88fff6c62943f92c7c38d9b6/9.5/Dockerfile) - [`9.6-beta1`, `9.6` (*9.6/Dockerfile*)](https://github.com/docker-library/postgres/blob/b1831ce069d10b14be05b9ddf6823e3d18c62cee/9.6/Dockerfile) +- [`9.5.3`, `9.5`, `9`, `latest` (*9.5/Dockerfile*)](https://github.com/docker-library/postgres/blob/04b1d366d51a942b88fff6c62943f92c7c38d9b6/9.5/Dockerfile) +- [`9.4.8`, `9.4` (*9.4/Dockerfile*)](https://github.com/docker-library/postgres/blob/04b1d366d51a942b88fff6c62943f92c7c38d9b6/9.4/Dockerfile) +- [`9.3.13`, `9.3` (*9.3/Dockerfile*)](https://github.com/docker-library/postgres/blob/04b1d366d51a942b88fff6c62943f92c7c38d9b6/9.3/Dockerfile) +- [`9.2.17`, `9.2` (*9.2/Dockerfile*)](https://github.com/docker-library/postgres/blob/04b1d366d51a942b88fff6c62943f92c7c38d9b6/9.2/Dockerfile) +- [`9.1.22`, `9.1` (*9.1/Dockerfile*)](https://github.com/docker-library/postgres/blob/04b1d366d51a942b88fff6c62943f92c7c38d9b6/9.1/Dockerfile) -[![](https://badge.imagelayers.io/postgres:latest.svg)](https://imagelayers.io/?images=postgres:9.1.22,postgres:9.2.17,postgres:9.3.13,postgres:9.4.8,postgres:9.5.3,postgres:9.6-beta1) +[![](https://badge.imagelayers.io/postgres:latest.svg)](https://imagelayers.io/?images=postgres:9.6-beta1,postgres:9.5.3,postgres:9.4.8,postgres:9.3.13,postgres:9.2.17,postgres:9.1.22) For more information about this image and its history, please see [the relevant manifest file (`library/postgres`)](https://github.com/docker-library/official-images/blob/master/library/postgres). 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%2Fpostgres). diff --git a/pypy/README.md b/pypy/README.md index c26775413..bcbdea536 100644 --- a/pypy/README.md +++ b/pypy/README.md @@ -1,13 +1,13 @@ # Supported tags and respective `Dockerfile` links - [`2-5.1.1`, `2-5.1`, `2-5`, `2` (*2/Dockerfile*)](https://github.com/docker-library/pypy/blob/d0f1f8cf3dd4a4feefa0f6d101e40583429f647f/2/Dockerfile) -- [`2-5.1.1-onbuild`, `2-5.1-onbuild`, `2-5-onbuild`, `2-onbuild` (*2/onbuild/Dockerfile*)](https://github.com/docker-library/pypy/blob/b48e8489ab794a2bacfd396c2f8e1a5b06d6ae48/2/onbuild/Dockerfile) - [`2-5.1.1-slim`, `2-5.1-slim`, `2-5-slim`, `2-slim` (*2/slim/Dockerfile*)](https://github.com/docker-library/pypy/blob/d0f1f8cf3dd4a4feefa0f6d101e40583429f647f/2/slim/Dockerfile) +- [`2-5.1.1-onbuild`, `2-5.1-onbuild`, `2-5-onbuild`, `2-onbuild` (*2/onbuild/Dockerfile*)](https://github.com/docker-library/pypy/blob/b48e8489ab794a2bacfd396c2f8e1a5b06d6ae48/2/onbuild/Dockerfile) - [`3-2.4.0`, `3-2.4`, `3-2`, `3`, `latest` (*3/Dockerfile*)](https://github.com/docker-library/pypy/blob/d0f1f8cf3dd4a4feefa0f6d101e40583429f647f/3/Dockerfile) -- [`3-2.4.0-onbuild`, `3-2.4-onbuild`, `3-2-onbuild`, `3-onbuild`, `onbuild` (*3/onbuild/Dockerfile*)](https://github.com/docker-library/pypy/blob/b48e8489ab794a2bacfd396c2f8e1a5b06d6ae48/3/onbuild/Dockerfile) - [`3-2.4.0-slim`, `3-2.4-slim`, `3-2-slim`, `3-slim`, `slim` (*3/slim/Dockerfile*)](https://github.com/docker-library/pypy/blob/d0f1f8cf3dd4a4feefa0f6d101e40583429f647f/3/slim/Dockerfile) +- [`3-2.4.0-onbuild`, `3-2.4-onbuild`, `3-2-onbuild`, `3-onbuild`, `onbuild` (*3/onbuild/Dockerfile*)](https://github.com/docker-library/pypy/blob/b48e8489ab794a2bacfd396c2f8e1a5b06d6ae48/3/onbuild/Dockerfile) -[![](https://badge.imagelayers.io/pypy:latest.svg)](https://imagelayers.io/?images=pypy:2-5.1.1,pypy:2-5.1.1-onbuild,pypy:2-5.1.1-slim,pypy:3-2.4.0,pypy:3-2.4.0-onbuild,pypy:3-2.4.0-slim) +[![](https://badge.imagelayers.io/pypy:latest.svg)](https://imagelayers.io/?images=pypy:2-5.1.1,pypy:2-5.1.1-slim,pypy:2-5.1.1-onbuild,pypy:3-2.4.0,pypy:3-2.4.0-slim,pypy:3-2.4.0-onbuild) 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). @@ -62,26 +62,6 @@ or (again, if you need to use Python 2): $ docker run -it --rm --name my-running-script -v "$PWD":/usr/src/myapp -w /usr/src/myapp pypy:2 pypy your-daemon-or-script.py ``` -# Image Variants - -The `pypy` images come in many flavors, each designed for a specific use case. - -## `pypy:` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. This tag is based off of [`buildpack-deps`](https://registry.hub.docker.com/_/buildpack-deps/). `buildpack-deps` is designed for the average user of docker who has many images on their system. It, by design, has a large number of extremely common Debian packages. This reduces the number of packages that images that derive from it need to install, thus reducing the overall size of all images on your system. - -## `pypy:onbuild` - -This image makes building derivative images easier. For most use cases, creating a `Dockerfile` in the base of your project directory with the line `FROM pypy:onbuild` will be enough to create a stand-alone image for your project. - -While the `onbuild` variant is really useful for "getting off the ground running" (zero to Dockerized in a short period of time), it's not recommended for long-term usage within a project due to the lack of control over *when* the `ONBUILD` triggers fire (see also [`docker/docker#5714`](https://github.com/docker/docker/issues/5714), [`docker/docker#8240`](https://github.com/docker/docker/issues/8240), [`docker/docker#11917`](https://github.com/docker/docker/issues/11917)). - -Once you've got a handle on how your project functions within Docker, you'll probably want to adjust your `Dockerfile` to inherit from a non-`onbuild` variant and copy the commands from the `onbuild` variant `Dockerfile` (moving the `ONBUILD` lines to the end and removing the `ONBUILD` keywords) into your own file so that you have tighter control over them and more transparency for yourself and others looking at your `Dockerfile` as to what it does. This also makes it easier to add additional requirements as time goes on (such as installing more packages before performing the previously-`ONBUILD` steps). - -## `pypy:slim` - -This image does not contain the common packages contained in the default tag and only contains the minimal packages needed to run `pypy`. Unless you are working in an environment where *only* the pypy image will be deployed and you have space constraints, we highly recommend using the default image of this repository. - # License View [license information](https://bitbucket.org/pypy/pypy/src/c3ff0dd6252b6ba0d230f3624dbb4aab8973a1d0/LICENSE?at=default) for software contained in this image. diff --git a/python/README.md b/python/README.md index 4dbec9c54..06f170842 100644 --- a/python/README.md +++ b/python/README.md @@ -1,26 +1,26 @@ # Supported tags and respective `Dockerfile` links - [`2.7.11`, `2.7`, `2` (*2.7/Dockerfile*)](https://github.com/docker-library/python/blob/9383f7d4d2f96068e8957651aa3588fee8b48f71/2.7/Dockerfile) -- [`2.7.11-onbuild`, `2.7-onbuild`, `2-onbuild` (*2.7/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/7663560df7547e69d13b1b548675502f4e0917d1/2.7/onbuild/Dockerfile) - [`2.7.11-slim`, `2.7-slim`, `2-slim` (*2.7/slim/Dockerfile*)](https://github.com/docker-library/python/blob/9383f7d4d2f96068e8957651aa3588fee8b48f71/2.7/slim/Dockerfile) - [`2.7.11-alpine`, `2.7-alpine`, `2-alpine` (*2.7/alpine/Dockerfile*)](https://github.com/docker-library/python/blob/0610d9ccc2dc8ad4ab6038f775e7a28cadf12114/2.7/alpine/Dockerfile) - [`2.7.11-wheezy`, `2.7-wheezy`, `2-wheezy` (*2.7/wheezy/Dockerfile*)](https://github.com/docker-library/python/blob/9383f7d4d2f96068e8957651aa3588fee8b48f71/2.7/wheezy/Dockerfile) +- [`2.7.11-onbuild`, `2.7-onbuild`, `2-onbuild` (*2.7/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/7663560df7547e69d13b1b548675502f4e0917d1/2.7/onbuild/Dockerfile) - [`3.3.6`, `3.3` (*3.3/Dockerfile*)](https://github.com/docker-library/python/blob/9383f7d4d2f96068e8957651aa3588fee8b48f71/3.3/Dockerfile) -- [`3.3.6-onbuild`, `3.3-onbuild` (*3.3/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/7663560df7547e69d13b1b548675502f4e0917d1/3.3/onbuild/Dockerfile) - [`3.3.6-slim`, `3.3-slim` (*3.3/slim/Dockerfile*)](https://github.com/docker-library/python/blob/9383f7d4d2f96068e8957651aa3588fee8b48f71/3.3/slim/Dockerfile) - [`3.3.6-alpine`, `3.3-alpine` (*3.3/alpine/Dockerfile*)](https://github.com/docker-library/python/blob/0610d9ccc2dc8ad4ab6038f775e7a28cadf12114/3.3/alpine/Dockerfile) - [`3.3.6-wheezy`, `3.3-wheezy` (*3.3/wheezy/Dockerfile*)](https://github.com/docker-library/python/blob/9383f7d4d2f96068e8957651aa3588fee8b48f71/3.3/wheezy/Dockerfile) +- [`3.3.6-onbuild`, `3.3-onbuild` (*3.3/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/7663560df7547e69d13b1b548675502f4e0917d1/3.3/onbuild/Dockerfile) - [`3.4.4`, `3.4` (*3.4/Dockerfile*)](https://github.com/docker-library/python/blob/9383f7d4d2f96068e8957651aa3588fee8b48f71/3.4/Dockerfile) -- [`3.4.4-onbuild`, `3.4-onbuild` (*3.4/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/7663560df7547e69d13b1b548675502f4e0917d1/3.4/onbuild/Dockerfile) - [`3.4.4-slim`, `3.4-slim` (*3.4/slim/Dockerfile*)](https://github.com/docker-library/python/blob/9383f7d4d2f96068e8957651aa3588fee8b48f71/3.4/slim/Dockerfile) - [`3.4.4-alpine`, `3.4-alpine` (*3.4/alpine/Dockerfile*)](https://github.com/docker-library/python/blob/0610d9ccc2dc8ad4ab6038f775e7a28cadf12114/3.4/alpine/Dockerfile) - [`3.4.4-wheezy`, `3.4-wheezy` (*3.4/wheezy/Dockerfile*)](https://github.com/docker-library/python/blob/9383f7d4d2f96068e8957651aa3588fee8b48f71/3.4/wheezy/Dockerfile) +- [`3.4.4-onbuild`, `3.4-onbuild` (*3.4/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/7663560df7547e69d13b1b548675502f4e0917d1/3.4/onbuild/Dockerfile) - [`3.5.1`, `3.5`, `3`, `latest` (*3.5/Dockerfile*)](https://github.com/docker-library/python/blob/9383f7d4d2f96068e8957651aa3588fee8b48f71/3.5/Dockerfile) -- [`3.5.1-onbuild`, `3.5-onbuild`, `3-onbuild`, `onbuild` (*3.5/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/0fa3202789648132971160f686f5a37595108f44/3.5/onbuild/Dockerfile) - [`3.5.1-slim`, `3.5-slim`, `3-slim`, `slim` (*3.5/slim/Dockerfile*)](https://github.com/docker-library/python/blob/9383f7d4d2f96068e8957651aa3588fee8b48f71/3.5/slim/Dockerfile) - [`3.5.1-alpine`, `3.5-alpine`, `3-alpine`, `alpine` (*3.5/alpine/Dockerfile*)](https://github.com/docker-library/python/blob/0610d9ccc2dc8ad4ab6038f775e7a28cadf12114/3.5/alpine/Dockerfile) +- [`3.5.1-onbuild`, `3.5-onbuild`, `3-onbuild`, `onbuild` (*3.5/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/0fa3202789648132971160f686f5a37595108f44/3.5/onbuild/Dockerfile) -[![](https://badge.imagelayers.io/python:latest.svg)](https://imagelayers.io/?images=python:2.7.11,python:2.7.11-onbuild,python:2.7.11-slim,python:2.7.11-alpine,python:2.7.11-wheezy,python:3.3.6,python:3.3.6-onbuild,python:3.3.6-slim,python:3.3.6-alpine,python:3.3.6-wheezy,python:3.4.4,python:3.4.4-onbuild,python:3.4.4-slim,python:3.4.4-alpine,python:3.4.4-wheezy,python:3.5.1,python:3.5.1-onbuild,python:3.5.1-slim,python:3.5.1-alpine) +[![](https://badge.imagelayers.io/python:latest.svg)](https://imagelayers.io/?images=python:2.7.11,python:2.7.11-slim,python:2.7.11-alpine,python:2.7.11-wheezy,python:2.7.11-onbuild,python:3.3.6,python:3.3.6-slim,python:3.3.6-alpine,python:3.3.6-wheezy,python:3.3.6-onbuild,python:3.4.4,python:3.4.4-slim,python:3.4.4-alpine,python:3.4.4-wheezy,python:3.4.4-onbuild,python:3.5.1,python:3.5.1-slim,python:3.5.1-alpine,python:3.5.1-onbuild) 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). @@ -73,34 +73,6 @@ or (again, if you need to use Python 2): $ docker run -it --rm --name my-running-script -v "$PWD":/usr/src/myapp -w /usr/src/myapp python:2 python your-daemon-or-script.py ``` -# Image Variants - -The `python` images come in many flavors, each designed for a specific use case. - -## `python:` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. This tag is based off of [`buildpack-deps`](https://registry.hub.docker.com/_/buildpack-deps/). `buildpack-deps` is designed for the average user of docker who has many images on their system. It, by design, has a large number of extremely common Debian packages. This reduces the number of packages that images that derive from it need to install, thus reducing the overall size of all images on your system. - -## `python:alpine` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `python:onbuild` - -This image feeds your `requirements.txt` file automatically to `pip` in order to make building derivative images easier. For most use cases, creating a `Dockerfile` in the base of your project directory with the line `FROM python:onbuild` will be enough to create a stand-alone image for your project. - -While the `onbuild` variant is really useful for "getting off the ground running" (zero to Dockerized in a short period of time), it's not recommended for long-term usage within a project due to the lack of control over *when* the `ONBUILD` triggers fire (see also [`docker/docker#5714`](https://github.com/docker/docker/issues/5714), [`docker/docker#8240`](https://github.com/docker/docker/issues/8240), [`docker/docker#11917`](https://github.com/docker/docker/issues/11917)). - -Once you've got a handle on how your project functions within Docker, you'll probably want to adjust your `Dockerfile` to inherit from a non-`onbuild` variant and copy the commands from the `onbuild` variant `Dockerfile` (moving the `ONBUILD` lines to the end and removing the `ONBUILD` keywords) into your own file so that you have tighter control over them and more transparency for yourself and others looking at your `Dockerfile` as to what it does. This also makes it easier to add additional requirements as time goes on (such as installing more packages before performing the previously-`ONBUILD` steps). - -## `python:slim` - -This image does not contain the common packages contained in the default tag and only contains the minimal packages needed to run `python`. Unless you are working in an environment where *only* the python image will be deployed and you have space constraints, we highly recommend using the default image of this repository. - # License View license information for [Python 2](https://docs.python.org/2/license.html) and [Python 3](https://docs.python.org/3/license.html). diff --git a/rabbitmq/README.md b/rabbitmq/README.md index 041dc2196..128819b90 100644 --- a/rabbitmq/README.md +++ b/rabbitmq/README.md @@ -1,7 +1,7 @@ # Supported tags and respective `Dockerfile` links - [`3.6.2`, `3.6`, `3`, `latest` (*Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/6b496ac32e18fbff4b2b45e0577a79b10edd4df0/Dockerfile) -- [`3.6.2-management`, `3.6-management`, `3-management`, `management` (*management/Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/6b496ac32e18fbff4b2b45e0577a79b10edd4df0/management/Dockerfile) +- [`3.6.2-management`, `3.6-management`, `3-management`, `management` (*management/Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/dc712681dcaeadb0371be66be5e96563be364e5d/management/Dockerfile) [![](https://badge.imagelayers.io/rabbitmq:latest.svg)](https://imagelayers.io/?images=rabbitmq:3.6.2,rabbitmq:3.6.2-management) diff --git a/rails/README.md b/rails/README.md index e2f87651f..fbb3af849 100644 --- a/rails/README.md +++ b/rails/README.md @@ -63,22 +63,6 @@ $ docker run -it --rm --user "$(id -u):$(id -g)" -v "$PWD":/usr/src/app -w /usr/ This will create a sub-directory named `webapp` inside your current directory. -# Image Variants - -The `rails` images come in many flavors, each designed for a specific use case. - -## `rails:` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `rails:onbuild` - -This image makes building derivative images easier. For most use cases, creating a `Dockerfile` in the base of your project directory with the line `FROM rails:onbuild` will be enough to create a stand-alone image for your project. - -While the `onbuild` variant is really useful for "getting off the ground running" (zero to Dockerized in a short period of time), it's not recommended for long-term usage within a project due to the lack of control over *when* the `ONBUILD` triggers fire (see also [`docker/docker#5714`](https://github.com/docker/docker/issues/5714), [`docker/docker#8240`](https://github.com/docker/docker/issues/8240), [`docker/docker#11917`](https://github.com/docker/docker/issues/11917)). - -Once you've got a handle on how your project functions within Docker, you'll probably want to adjust your `Dockerfile` to inherit from a non-`onbuild` variant and copy the commands from the `onbuild` variant `Dockerfile` (moving the `ONBUILD` lines to the end and removing the `ONBUILD` keywords) into your own file so that you have tighter control over them and more transparency for yourself and others looking at your `Dockerfile` as to what it does. This also makes it easier to add additional requirements as time goes on (such as installing more packages before performing the previously-`ONBUILD` steps). - # License View [license information](https://github.com/rails/rails#license) for the software contained in this image. diff --git a/redis/README.md b/redis/README.md index 5deb26387..5f689784a 100644 --- a/redis/README.md +++ b/redis/README.md @@ -77,22 +77,6 @@ Where `/myredis/conf/` is a local directory containing your `redis.conf` file. U This variant is *not* a 32bit image (and will not run on 32bit hardware), but includes Redis compiled as a 32bit binary, especially for users who need the decreased memory requirements associated with that. See ["Using 32 bit instances"](http://redis.io/topics/memory-optimization#using-32-bit-instances) in the Redis documentation for more information. -# Image Variants - -The `redis` images come in many flavors, each designed for a specific use case. - -## `redis:` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. - -## `redis:alpine` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - # License View [license information](http://redis.io/topics/license) for the software contained in this image. diff --git a/ruby/README.md b/ruby/README.md index e59da6370..0990db4eb 100644 --- a/ruby/README.md +++ b/ruby/README.md @@ -1,19 +1,19 @@ # Supported tags and respective `Dockerfile` links - [`2.1.9`, `2.1` (*2.1/Dockerfile*)](https://github.com/docker-library/ruby/blob/a6202f065bc6d5562703eed454e3479359234750/2.1/Dockerfile) -- [`2.1.9-onbuild`, `2.1-onbuild` (*2.1/onbuild/Dockerfile*)](https://github.com/docker-library/ruby/blob/5d04363db6f7ae316ef7056063f020557db828e1/2.1/onbuild/Dockerfile) - [`2.1.9-slim`, `2.1-slim` (*2.1/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/a6202f065bc6d5562703eed454e3479359234750/2.1/slim/Dockerfile) - [`2.1.9-alpine`, `2.1-alpine` (*2.1/alpine/Dockerfile*)](https://github.com/docker-library/ruby/blob/972ed547de34b8644de4819001906cfc79907be2/2.1/alpine/Dockerfile) +- [`2.1.9-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/a6202f065bc6d5562703eed454e3479359234750/2.2/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.2.5-slim`, `2.2-slim` (*2.2/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/a6202f065bc6d5562703eed454e3479359234750/2.2/slim/Dockerfile) - [`2.2.5-alpine`, `2.2-alpine` (*2.2/alpine/Dockerfile*)](https://github.com/docker-library/ruby/blob/972ed547de34b8644de4819001906cfc79907be2/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/a6202f065bc6d5562703eed454e3479359234750/2.3/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) - [`2.3.1-slim`, `2.3-slim`, `2-slim`, `slim` (*2.3/slim/Dockerfile*)](https://github.com/docker-library/ruby/blob/a6202f065bc6d5562703eed454e3479359234750/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/972ed547de34b8644de4819001906cfc79907be2/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) -[![](https://badge.imagelayers.io/ruby:latest.svg)](https://imagelayers.io/?images=ruby:2.1.9,ruby:2.1.9-onbuild,ruby:2.1.9-slim,ruby:2.1.9-alpine,ruby:2.2.5,ruby:2.2.5-onbuild,ruby:2.2.5-slim,ruby:2.2.5-alpine,ruby:2.3.1,ruby:2.3.1-onbuild,ruby:2.3.1-slim,ruby:2.3.1-alpine) +[![](https://badge.imagelayers.io/ruby:latest.svg)](https://imagelayers.io/?images=ruby:2.1.9,ruby:2.1.9-slim,ruby:2.1.9-alpine,ruby:2.1.9-onbuild,ruby:2.2.5,ruby:2.2.5-slim,ruby:2.2.5-alpine,ruby:2.2.5-onbuild,ruby:2.3.1,ruby:2.3.1-slim,ruby:2.3.1-alpine,ruby:2.3.1-onbuild) 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). @@ -64,34 +64,6 @@ 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 ``` -# Image Variants - -The `ruby` images come in many flavors, each designed for a specific use case. - -## `ruby:` - -This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of. This tag is based off of [`buildpack-deps`](https://registry.hub.docker.com/_/buildpack-deps/). `buildpack-deps` is designed for the average user of docker who has many images on their system. It, by design, has a large number of extremely common Debian packages. This reduces the number of packages that images that derive from it need to install, thus reducing the overall size of all images on your system. - -## `ruby:alpine` - -This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general. - -This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. - -To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `ruby:onbuild` - -This image makes building derivative images easier. For most use cases, creating a `Dockerfile` in the base of your project directory with the line `FROM ruby:onbuild` will be enough to create a stand-alone image for your project. - -While the `onbuild` variant is really useful for "getting off the ground running" (zero to Dockerized in a short period of time), it's not recommended for long-term usage within a project due to the lack of control over *when* the `ONBUILD` triggers fire (see also [`docker/docker#5714`](https://github.com/docker/docker/issues/5714), [`docker/docker#8240`](https://github.com/docker/docker/issues/8240), [`docker/docker#11917`](https://github.com/docker/docker/issues/11917)). - -Once you've got a handle on how your project functions within Docker, you'll probably want to adjust your `Dockerfile` to inherit from a non-`onbuild` variant and copy the commands from the `onbuild` variant `Dockerfile` (moving the `ONBUILD` lines to the end and removing the `ONBUILD` keywords) into your own file so that you have tighter control over them and more transparency for yourself and others looking at your `Dockerfile` as to what it does. This also makes it easier to add additional requirements as time goes on (such as installing more packages before performing the previously-`ONBUILD` steps). - -## `ruby:slim` - -This image does not contain the common packages contained in the default tag and only contains the minimal packages needed to run `ruby`. Unless you are working in an environment where *only* the ruby image will be deployed and you have space constraints, we highly recommend using the default image of this repository. - # License View [license information](https://www.ruby-lang.org/en/about/license.txt) for the software contained in this image. diff --git a/tomcat/README.md b/tomcat/README.md index 62cb740cc..ce28179d1 100644 --- a/tomcat/README.md +++ b/tomcat/README.md @@ -4,8 +4,8 @@ - [`6.0.45-jre8`, `6.0-jre8`, `6-jre8` (*6/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/ec75141e3cb6276b07d66c16042152e2d4de119c/6/jre8/Dockerfile) - [`7.0.69-jre7`, `7.0-jre7`, `7-jre7`, `7.0.69`, `7.0`, `7` (*7/jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/ec75141e3cb6276b07d66c16042152e2d4de119c/7/jre7/Dockerfile) - [`7.0.69-jre8`, `7.0-jre8`, `7-jre8` (*7/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/ec75141e3cb6276b07d66c16042152e2d4de119c/7/jre8/Dockerfile) -- [`8.0.35-jre7`, `8.0-jre7`, `8-jre7`, `8.0.35`, `8.0`, `8`, `latest` (*8.0/jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/d08341e2ed934abd7ff1baa0c26d6eac4f45f73a/8.0/jre7/Dockerfile) -- [`8.0.35-jre8`, `8.0-jre8`, `8-jre8` (*8.0/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/d08341e2ed934abd7ff1baa0c26d6eac4f45f73a/8.0/jre8/Dockerfile) +- [`8.0.35-jre7`, `8.0-jre7`, `8-jre7`, `jre7`, `8.0.35`, `8.0`, `8`, `latest` (*8.0/jre7/Dockerfile*)](https://github.com/docker-library/tomcat/blob/d08341e2ed934abd7ff1baa0c26d6eac4f45f73a/8.0/jre7/Dockerfile) +- [`8.0.35-jre8`, `8.0-jre8`, `8-jre8`, `jre8` (*8.0/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/d08341e2ed934abd7ff1baa0c26d6eac4f45f73a/8.0/jre8/Dockerfile) - [`8.5.2-jre8`, `8.5-jre8`, `8.5.2`, `8.5` (*8.5/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/d08341e2ed934abd7ff1baa0c26d6eac4f45f73a/8.5/jre8/Dockerfile) - [`9.0.0.M6-jre8`, `9.0.0-jre8`, `9.0-jre8`, `9-jre8`, `9.0.0.M6`, `9.0.0`, `9.0`, `9` (*9.0/jre8/Dockerfile*)](https://github.com/docker-library/tomcat/blob/d08341e2ed934abd7ff1baa0c26d6eac4f45f73a/9.0/jre8/Dockerfile) diff --git a/wordpress/README.md b/wordpress/README.md index a06954d95..2ec8856d3 100644 --- a/wordpress/README.md +++ b/wordpress/README.md @@ -1,6 +1,6 @@ # Supported tags and respective `Dockerfile` links -- [`4.5.2-apache`, `4.5.2`, `4.5-apache`, `4.5`, `4-apache`, `apache`, `4`, `latest` (*apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/61dd78ce4fa9ccd592ead1edb379f209533b850c/apache/Dockerfile) +- [`4.5.2-apache`, `4.5-apache`, `4-apache`, `apache`, `4.5.2`, `4.5`, `4`, `latest` (*apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/61dd78ce4fa9ccd592ead1edb379f209533b850c/apache/Dockerfile) - [`4.5.2-fpm`, `4.5-fpm`, `4-fpm`, `fpm` (*fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/61dd78ce4fa9ccd592ead1edb379f209533b850c/fpm/Dockerfile) [![](https://badge.imagelayers.io/wordpress:latest.svg)](https://imagelayers.io/?images=wordpress:4.5.2-apache,wordpress:4.5.2-fpm)