From d4ed9d55ff69e7e717fe9942b47d6e115d4c24ea Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 27 Jul 2017 19:32:50 +0000 Subject: [PATCH] Run update.sh --- docker/README.md | 6 +++--- elixir/README.md | 15 +++++++++++++-- hello-world/README.md | 2 +- hello-world/content.md | 2 +- telegraf/README.md | 4 ++-- traefik/README.md | 4 ++-- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/docker/README.md b/docker/README.md index ba189c9f0..ed0704712 100644 --- a/docker/README.md +++ b/docker/README.md @@ -19,9 +19,9 @@ WARNING: - [`17.07.0-ce-rc1`, `17.07.0-ce`, `17.07.0`, `17.07-rc`, `rc`, `test` (*17.07-rc/Dockerfile*)](https://github.com/docker-library/docker/blob/c49283cd0ab1dff78a4cb1b5c62618b8b1744595/17.07-rc/Dockerfile) - [`17.07.0-ce-rc1-dind`, `17.07.0-ce-dind`, `17.07.0-dind`, `17.07-rc-dind`, `rc-dind`, `test-dind` (*17.07-rc/dind/Dockerfile*)](https://github.com/docker-library/docker/blob/c49283cd0ab1dff78a4cb1b5c62618b8b1744595/17.07-rc/dind/Dockerfile) - [`17.07.0-ce-rc1-git`, `17.07.0-ce-git`, `17.07.0-git`, `17.07-rc-git`, `rc-git`, `test-git` (*17.07-rc/git/Dockerfile*)](https://github.com/docker-library/docker/blob/c49283cd0ab1dff78a4cb1b5c62618b8b1744595/17.07-rc/git/Dockerfile) -- [`17.06.1-ce-rc1`, `17.06.1-ce`, `17.06.1`, `17.06-rc` (*17.06-rc/Dockerfile*)](https://github.com/docker-library/docker/blob/f60aacc67bcba2d5b45c28665742a60b99d24466/17.06-rc/Dockerfile) -- [`17.06.1-ce-rc1-dind`, `17.06.1-ce-dind`, `17.06.1-dind`, `17.06-rc-dind` (*17.06-rc/dind/Dockerfile*)](https://github.com/docker-library/docker/blob/f60aacc67bcba2d5b45c28665742a60b99d24466/17.06-rc/dind/Dockerfile) -- [`17.06.1-ce-rc1-git`, `17.06.1-ce-git`, `17.06.1-git`, `17.06-rc-git` (*17.06-rc/git/Dockerfile*)](https://github.com/docker-library/docker/blob/f60aacc67bcba2d5b45c28665742a60b99d24466/17.06-rc/git/Dockerfile) +- [`17.06.1-ce-rc2`, `17.06.1-ce`, `17.06.1`, `17.06-rc` (*17.06-rc/Dockerfile*)](https://github.com/docker-library/docker/blob/f3b3989b217c4ed2bf655f904eed0812b01c3326/17.06-rc/Dockerfile) +- [`17.06.1-ce-rc2-dind`, `17.06.1-ce-dind`, `17.06.1-dind`, `17.06-rc-dind` (*17.06-rc/dind/Dockerfile*)](https://github.com/docker-library/docker/blob/f60aacc67bcba2d5b45c28665742a60b99d24466/17.06-rc/dind/Dockerfile) +- [`17.06.1-ce-rc2-git`, `17.06.1-ce-git`, `17.06.1-git`, `17.06-rc-git` (*17.06-rc/git/Dockerfile*)](https://github.com/docker-library/docker/blob/f60aacc67bcba2d5b45c28665742a60b99d24466/17.06-rc/git/Dockerfile) - [`17.06.0-ce`, `17.06.0`, `17.06`, `17`, `edge`, `stable`, `latest` (*17.06/Dockerfile*)](https://github.com/docker-library/docker/blob/e68e4e6ec06c055a95d441144b0e34d0872f2665/17.06/Dockerfile) - [`17.06.0-ce-dind`, `17.06.0-dind`, `17.06-dind`, `17-dind`, `edge-dind`, `stable-dind`, `dind` (*17.06/dind/Dockerfile*)](https://github.com/docker-library/docker/blob/e68e4e6ec06c055a95d441144b0e34d0872f2665/17.06/dind/Dockerfile) - [`17.06.0-ce-git`, `17.06.0-git`, `17.06-git`, `17-git`, `edge-git`, `stable-git`, `git` (*17.06/git/Dockerfile*)](https://github.com/docker-library/docker/blob/e68e4e6ec06c055a95d441144b0e34d0872f2665/17.06/git/Dockerfile) diff --git a/elixir/README.md b/elixir/README.md index 23c4b017d..efb79bef2 100644 --- a/elixir/README.md +++ b/elixir/README.md @@ -16,8 +16,11 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`1.4.5`, `1.4`, `latest` (*1.4/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/8f1888ae05506b9ad12e1b97f084a15e7588f442/1.4/Dockerfile) -- [`1.4.5-slim`, `1.4-slim`, `slim` (*1.4/slim/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/8f1888ae05506b9ad12e1b97f084a15e7588f442/1.4/slim/Dockerfile) +- [`1.5.0`, `1.5`, `latest` (*1.5/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/44078809bd868e654d93766f8ac3c778f688a951/1.5/Dockerfile) +- [`1.5.0-slim`, `1.5-slim`, `slim` (*1.5/slim/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/a57ae22bc9505ccdc7662f2556143e1048361d47/1.5/slim/Dockerfile) +- [`1.5.0-alpine`, `1.5-alpine`, `alpine` (*1.5/alpine/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/a57ae22bc9505ccdc7662f2556143e1048361d47/1.5/alpine/Dockerfile) +- [`1.4.5`, `1.4` (*1.4/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/8f1888ae05506b9ad12e1b97f084a15e7588f442/1.4/Dockerfile) +- [`1.4.5-slim`, `1.4-slim` (*1.4/slim/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/8f1888ae05506b9ad12e1b97f084a15e7588f442/1.4/slim/Dockerfile) - [`1.3.4`, `1.3` (*1.3/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/d8d656d7c0dc9dd2956a22276c93cb97568ea6d4/1.3/Dockerfile) - [`1.3.4-slim`, `1.3-slim` (*1.3/slim/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/d8d656d7c0dc9dd2956a22276c93cb97568ea6d4/1.3/slim/Dockerfile) - [`1.2.6`, `1.2` (*1.2/Dockerfile*)](https://github.com/c0b/docker-elixir/blob/77b9a3da43ce035327ae29083e567191d60a6ac8/1.2/Dockerfile) @@ -99,6 +102,14 @@ This is the defacto image. If you are unsure about what your needs are, you prob This image does not contain the common packages contained in the default tag and only contains the minimal packages needed to run `elixir`. Unless you are working in an environment where *only* the `elixir` image will be deployed and you have space constraints, we highly recommend using the default image of this repository. +## `elixir: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 Copyright 2012 Plataformatec diff --git a/hello-world/README.md b/hello-world/README.md index 40450fa35..93421e4af 100644 --- a/hello-world/README.md +++ b/hello-world/README.md @@ -72,7 +72,7 @@ For more examples and ideas, visit: $ docker images hello-world REPOSITORY TAG IMAGE ID SIZE -hello-world latest 1815c82652c0 1.84kB +hello-world latest 1815c82652c0 1.84 kB ``` ![logo](https://raw.githubusercontent.com/docker-library/docs/01c12653951b2fe592c1f93a13b4e289ada0e3a1/hello-world/logo.png) diff --git a/hello-world/content.md b/hello-world/content.md index 804460cbe..b7a7eb18b 100644 --- a/hello-world/content.md +++ b/hello-world/content.md @@ -26,7 +26,7 @@ For more examples and ideas, visit: $ docker images hello-world REPOSITORY TAG IMAGE ID SIZE -hello-world latest 1815c82652c0 1.84kB +hello-world latest 1815c82652c0 1.84 kB ``` %%LOGO%% diff --git a/telegraf/README.md b/telegraf/README.md index 528e0b7a7..d00ba5ea2 100644 --- a/telegraf/README.md +++ b/telegraf/README.md @@ -18,8 +18,8 @@ WARNING: - [`1.2`, `1.2.1` (*telegraf/1.2/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/9c2c0d225ca0f2cb5d28749ed2bbd25122b46c9f/telegraf/1.2/Dockerfile) - [`1.2-alpine`, `1.2.1-alpine` (*telegraf/1.2/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/9c2c0d225ca0f2cb5d28749ed2bbd25122b46c9f/telegraf/1.2/alpine/Dockerfile) -- [`1.3`, `1.3.4`, `latest` (*telegraf/1.3/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/32861831b4b02f5d7ea1b58dea6cefc6ca192a75/telegraf/1.3/Dockerfile) -- [`1.3-alpine`, `1.3.4-alpine`, `alpine` (*telegraf/1.3/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/32861831b4b02f5d7ea1b58dea6cefc6ca192a75/telegraf/1.3/alpine/Dockerfile) +- [`1.3`, `1.3.5`, `latest` (*telegraf/1.3/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/acd3023f04fc25ef8b4ebe2535b093bdc976ae57/telegraf/1.3/Dockerfile) +- [`1.3-alpine`, `1.3.5-alpine`, `alpine` (*telegraf/1.3/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/acd3023f04fc25ef8b4ebe2535b093bdc976ae57/telegraf/1.3/alpine/Dockerfile) # Quick reference diff --git a/traefik/README.md b/traefik/README.md index b4fdfec24..171e8a9c9 100644 --- a/traefik/README.md +++ b/traefik/README.md @@ -16,8 +16,8 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`v1.3.3`, `1.3.3`, `v1.3`, `1.3`, `raclette`, `latest` (*Dockerfile*)](https://github.com/containous/traefik-library-image/blob/127ae9f3c881ce53f73f0fa0cd52fe947b77ef6b/Dockerfile) -- [`v1.3.3-alpine`, `1.3.3-alpine`, `v1.3-alpine`, `1.3-alpine`, `raclette-alpine` (*alpine/Dockerfile*)](https://github.com/containous/traefik-library-image/blob/127ae9f3c881ce53f73f0fa0cd52fe947b77ef6b/alpine/Dockerfile) +- [`v1.3.4`, `1.3.4`, `v1.3`, `1.3`, `raclette`, `latest` (*Dockerfile*)](https://github.com/containous/traefik-library-image/blob/33eb11c2139a48ac3725d39251b7d0f5610eaf36/Dockerfile) +- [`v1.3.4-alpine`, `1.3.4-alpine`, `v1.3-alpine`, `1.3-alpine`, `raclette-alpine` (*alpine/Dockerfile*)](https://github.com/containous/traefik-library-image/blob/33eb11c2139a48ac3725d39251b7d0f5610eaf36/alpine/Dockerfile) # Quick reference