From 4b3105658732b33e427875aae501b284afd02cef Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 8 Dec 2016 12:36:22 -0800 Subject: [PATCH] Run update.sh --- ghost/README.md | 2 +- logstash/README.md | 37 ++++++++++++++++++++++++++++++------- python/README.md | 10 +++++----- rabbitmq/README.md | 2 +- 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/ghost/README.md b/ghost/README.md index e1ab93658..1f31ad90d 100644 --- a/ghost/README.md +++ b/ghost/README.md @@ -1,6 +1,6 @@ # Supported tags and respective `Dockerfile` links -- [`0.11.3`, `0.11`, `0`, `latest` (*Dockerfile*)](https://github.com/docker-library/ghost/blob/9e9522838f378c6c4acaf87a5fabaceab34cd2e0/Dockerfile) +- [`0.11.3`, `0.11`, `0`, `latest` (*Dockerfile*)](https://github.com/docker-library/ghost/blob/4afb4dbe3b4306056b16b3aa7fc8f7aca2b1d281/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). diff --git a/logstash/README.md b/logstash/README.md index 11720db72..6bd44f104 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -1,12 +1,19 @@ # Supported tags and respective `Dockerfile` links -- [`1.5.6-1`, `1.5.6`, `1.5`, `1` (*1.5/Dockerfile*)](https://github.com/docker-library/logstash/blob/f4cb56f776ea44cc2b10cb8a670ecf6309baf3d7/1.5/Dockerfile) -- [`2.0.0-1`, `2.0.0`, `2.0` (*2.0/Dockerfile*)](https://github.com/docker-library/logstash/blob/f4cb56f776ea44cc2b10cb8a670ecf6309baf3d7/2.0/Dockerfile) -- [`2.1.3-1`, `2.1.3`, `2.1` (*2.1/Dockerfile*)](https://github.com/docker-library/logstash/blob/f4cb56f776ea44cc2b10cb8a670ecf6309baf3d7/2.1/Dockerfile) -- [`2.2.4-1`, `2.2.4`, `2.2` (*2.2/Dockerfile*)](https://github.com/docker-library/logstash/blob/f4cb56f776ea44cc2b10cb8a670ecf6309baf3d7/2.2/Dockerfile) -- [`2.3.4-1`, `2.3.4`, `2.3` (*2.3/Dockerfile*)](https://github.com/docker-library/logstash/blob/f4cb56f776ea44cc2b10cb8a670ecf6309baf3d7/2.3/Dockerfile) -- [`2.4.1-1`, `2.4.1`, `2.4`, `2` (*2.4/Dockerfile*)](https://github.com/docker-library/logstash/blob/f4cb56f776ea44cc2b10cb8a670ecf6309baf3d7/2.4/Dockerfile) -- [`5.0.2-1`, `5.0.2`, `5.0`, `5`, `latest` (*5.0/Dockerfile*)](https://github.com/docker-library/logstash/blob/79bc3b0c32cb559654228ca79cc9ed4b0f1b158c/5.0/Dockerfile) +- [`5.0.2`, `5.0`, `5`, `latest` (*5.0/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/5.0/Dockerfile) +- [`5.0.2-alpine`, `5.0-alpine`, `5-alpine`, `alpine` (*5.0/alpine/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/5.0/alpine/Dockerfile) +- [`2.4.1`, `2.4`, `2` (*2.4/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/2.4/Dockerfile) +- [`2.4.1-alpine`, `2.4-alpine`, `2-alpine` (*2.4/alpine/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/2.4/alpine/Dockerfile) +- [`2.3.4`, `2.3` (*2.3/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/2.3/Dockerfile) +- [`2.3.4-alpine`, `2.3-alpine` (*2.3/alpine/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/2.3/alpine/Dockerfile) +- [`2.2.4`, `2.2` (*2.2/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/2.2/Dockerfile) +- [`2.2.4-alpine`, `2.2-alpine` (*2.2/alpine/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/2.2/alpine/Dockerfile) +- [`2.1.3`, `2.1` (*2.1/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/2.1/Dockerfile) +- [`2.1.3-alpine`, `2.1-alpine` (*2.1/alpine/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/2.1/alpine/Dockerfile) +- [`2.0.0`, `2.0` (*2.0/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/2.0/Dockerfile) +- [`2.0.0-alpine`, `2.0-alpine` (*2.0/alpine/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/2.0/alpine/Dockerfile) +- [`1.5.6`, `1.5`, `1` (*1.5/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/1.5/Dockerfile) +- [`1.5.6-alpine`, `1.5-alpine`, `1-alpine` (*1.5/alpine/Dockerfile*)](https://github.com/docker-library/logstash/blob/93d338f878f4adb1e4e8fa31407d9b4263c41932/1.5/alpine/Dockerfile) For more information about this image and its history, please see [the relevant manifest file (`library/logstash`)](https://github.com/docker-library/official-images/blob/master/library/logstash). 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%2Flogstash). @@ -56,6 +63,22 @@ Then, build with `docker build -t my-logstash .` and deploy with something like $ docker run -it --rm my-logstash ``` +# Image Variants + +The `logstash` images come in many flavors, each designed for a specific use case. + +## `logstash:` + +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. + +## `logstash: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](https://github.com/elastic/logstash/blob/master/LICENSE) for the software contained in this image. diff --git a/python/README.md b/python/README.md index edaf56a67..ee8768ff7 100644 --- a/python/README.md +++ b/python/README.md @@ -21,11 +21,11 @@ - [`3.5.2-alpine`, `3.5-alpine`, `3-alpine`, `alpine` (*3.5/alpine/Dockerfile*)](https://github.com/docker-library/python/blob/693a75332e8ae5ad3bfae6e8399c4d7cc3cb6181/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/693a75332e8ae5ad3bfae6e8399c4d7cc3cb6181/3.5/windows/windowsservercore/Dockerfile) -- [`3.6.0b4`, `3.6-rc`, `rc` (*3.6-rc/Dockerfile*)](https://github.com/docker-library/python/blob/d8aac61bc3abddfd7ba58724446cf9b0e949ffa4/3.6-rc/Dockerfile) -- [`3.6.0b4-slim`, `3.6-rc-slim`, `rc-slim` (*3.6-rc/slim/Dockerfile*)](https://github.com/docker-library/python/blob/d8aac61bc3abddfd7ba58724446cf9b0e949ffa4/3.6-rc/slim/Dockerfile) -- [`3.6.0b4-alpine`, `3.6-rc-alpine`, `rc-alpine` (*3.6-rc/alpine/Dockerfile*)](https://github.com/docker-library/python/blob/d8aac61bc3abddfd7ba58724446cf9b0e949ffa4/3.6-rc/alpine/Dockerfile) -- [`3.6.0b4-onbuild`, `3.6-rc-onbuild`, `rc-onbuild` (*3.6-rc/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/b16ff405101a9f6c6540fb3467ca25baa9610174/3.6-rc/onbuild/Dockerfile) -- [`3.6.0b4-windowsservercore`, `3.6-rc-windowsservercore`, `rc-windowsservercore` (*3.6-rc/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/python/blob/d8aac61bc3abddfd7ba58724446cf9b0e949ffa4/3.6-rc/windows/windowsservercore/Dockerfile) +- [`3.6.0rc1`, `3.6-rc`, `rc` (*3.6-rc/Dockerfile*)](https://github.com/docker-library/python/blob/12bf960914ceaec59562cf49cf048b971e54399a/3.6-rc/Dockerfile) +- [`3.6.0rc1-slim`, `3.6-rc-slim`, `rc-slim` (*3.6-rc/slim/Dockerfile*)](https://github.com/docker-library/python/blob/12bf960914ceaec59562cf49cf048b971e54399a/3.6-rc/slim/Dockerfile) +- [`3.6.0rc1-alpine`, `3.6-rc-alpine`, `rc-alpine` (*3.6-rc/alpine/Dockerfile*)](https://github.com/docker-library/python/blob/12bf960914ceaec59562cf49cf048b971e54399a/3.6-rc/alpine/Dockerfile) +- [`3.6.0rc1-onbuild`, `3.6-rc-onbuild`, `rc-onbuild` (*3.6-rc/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/b16ff405101a9f6c6540fb3467ca25baa9610174/3.6-rc/onbuild/Dockerfile) +- [`3.6.0rc1-windowsservercore`, `3.6-rc-windowsservercore`, `rc-windowsservercore` (*3.6-rc/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/python/blob/12bf960914ceaec59562cf49cf048b971e54399a/3.6-rc/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). diff --git a/rabbitmq/README.md b/rabbitmq/README.md index 7045f2a21..d1e9ac3e6 100644 --- a/rabbitmq/README.md +++ b/rabbitmq/README.md @@ -1,6 +1,6 @@ # Supported tags and respective `Dockerfile` links -- [`3.6.6`, `3.6`, `3`, `latest` (*Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/003537013a42e6939f7687c495de1129939f69af/Dockerfile) +- [`3.6.6`, `3.6`, `3`, `latest` (*Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/c766dd4dad64dd1c5550febff7e19ab763b7c5a4/Dockerfile) - [`3.6.6-management`, `3.6-management`, `3-management`, `management` (*management/Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/dc712681dcaeadb0371be66be5e96563be364e5d/management/Dockerfile) For more information about this image and its history, please see [the relevant manifest file (`library/rabbitmq`)](https://github.com/docker-library/official-images/blob/master/library/rabbitmq). 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%2Frabbitmq).