From ba607082fea64dae47f62e210081957d94d48166 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 13 Jan 2016 11:16:42 -0800 Subject: [PATCH] Run update.sh --- ghost/README.md | 2 +- hello-world/README.md | 4 ++-- hello-world/content.md | 4 ++-- percona/README.md | 4 ++-- postgres/README.md | 12 ++++++------ python/README.md | 11 ++++++----- redis/README.md | 17 +++++++++++++++++ 7 files changed, 36 insertions(+), 18 deletions(-) diff --git a/ghost/README.md b/ghost/README.md index a8efdc353..b072ea57e 100644 --- a/ghost/README.md +++ b/ghost/README.md @@ -1,6 +1,6 @@ # Supported tags and respective `Dockerfile` links -- [`0.7.4`, `0.7`, `0`, `latest` (*Dockerfile*)](https://github.com/docker-library/ghost/blob/16a6fd356668cb69086eddd6e2d62addcbc8bca0/Dockerfile) +- [`0.7.5`, `0.7`, `0`, `latest` (*Dockerfile*)](https://github.com/docker-library/ghost/blob/6b6ffbf7830d24bd5fa144e9c835a1f2f09df3c9/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). diff --git a/hello-world/README.md b/hello-world/README.md index a2233db2c..5afdc5cc2 100644 --- a/hello-world/README.md +++ b/hello-world/README.md @@ -33,8 +33,8 @@ For more examples and ideas, visit: $ docker images hello-world -REPOSITORY TAG IMAGE ID SIZE -hello-world latest 690ed74de00f 960 B +REPOSITORY TAG IMAGE ID VIRTUAL SIZE +hello-world latest 0a6ba66e537a 960 B ``` ![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 a1bdb089a..5a558c722 100644 --- a/hello-world/content.md +++ b/hello-world/content.md @@ -25,8 +25,8 @@ For more examples and ideas, visit: $ docker images hello-world -REPOSITORY TAG IMAGE ID SIZE -hello-world latest 690ed74de00f 960 B +REPOSITORY TAG IMAGE ID VIRTUAL SIZE +hello-world latest 0a6ba66e537a 960 B ``` %%LOGO%% diff --git a/percona/README.md b/percona/README.md index bca580f0b..3b8292c86 100644 --- a/percona/README.md +++ b/percona/README.md @@ -1,7 +1,7 @@ # Supported tags and respective `Dockerfile` links -- [`5.5.46`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/percona/blob/ee41cc830ff124c4a5c9de605b1a7e338ca6db91/5.5/Dockerfile) -- [`5.6.27`, `5.6`, `5`, `latest` (*5.6/Dockerfile*)](https://github.com/docker-library/percona/blob/ee41cc830ff124c4a5c9de605b1a7e338ca6db91/5.6/Dockerfile) +- [`5.5.47`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-library/percona/blob/f4735d6bded2f34cbcac18341d7fde8fa8757b2d/5.5/Dockerfile) +- [`5.6.28`, `5.6`, `5`, `latest` (*5.6/Dockerfile*)](https://github.com/docker-library/percona/blob/f4735d6bded2f34cbcac18341d7fde8fa8757b2d/5.6/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). diff --git a/postgres/README.md b/postgres/README.md index 35a5e7bf7..9fd853dcf 100644 --- a/postgres/README.md +++ b/postgres/README.md @@ -1,11 +1,11 @@ # Supported tags and respective `Dockerfile` links -- [`9.0.22`, `9.0` (*9.0/Dockerfile*)](https://github.com/docker-library/postgres/blob/d1644850949964935c418a73e0a7dc36f4f12dd9/9.0/Dockerfile) -- [`9.1.19`, `9.1` (*9.1/Dockerfile*)](https://github.com/docker-library/postgres/blob/d1644850949964935c418a73e0a7dc36f4f12dd9/9.1/Dockerfile) -- [`9.2.14`, `9.2` (*9.2/Dockerfile*)](https://github.com/docker-library/postgres/blob/d1644850949964935c418a73e0a7dc36f4f12dd9/9.2/Dockerfile) -- [`9.3.10`, `9.3` (*9.3/Dockerfile*)](https://github.com/docker-library/postgres/blob/d1644850949964935c418a73e0a7dc36f4f12dd9/9.3/Dockerfile) -- [`9.4.5`, `9.4` (*9.4/Dockerfile*)](https://github.com/docker-library/postgres/blob/d1644850949964935c418a73e0a7dc36f4f12dd9/9.4/Dockerfile) -- [`9.5.0`, `9.5`, `9`, `latest` (*9.5/Dockerfile*)](https://github.com/docker-library/postgres/blob/2c72165e4f9dc66a61998111f69b5eba0b6b71f4/9.5/Dockerfile) +- [`9.0.22`, `9.0` (*9.0/Dockerfile*)](https://github.com/docker-library/postgres/blob/9737ce4eeb7d580de8bd6831d8144ba08c316197/9.0/Dockerfile) +- [`9.1.19`, `9.1` (*9.1/Dockerfile*)](https://github.com/docker-library/postgres/blob/9737ce4eeb7d580de8bd6831d8144ba08c316197/9.1/Dockerfile) +- [`9.2.14`, `9.2` (*9.2/Dockerfile*)](https://github.com/docker-library/postgres/blob/9737ce4eeb7d580de8bd6831d8144ba08c316197/9.2/Dockerfile) +- [`9.3.10`, `9.3` (*9.3/Dockerfile*)](https://github.com/docker-library/postgres/blob/9737ce4eeb7d580de8bd6831d8144ba08c316197/9.3/Dockerfile) +- [`9.4.5`, `9.4` (*9.4/Dockerfile*)](https://github.com/docker-library/postgres/blob/9737ce4eeb7d580de8bd6831d8144ba08c316197/9.4/Dockerfile) +- [`9.5.0`, `9.5`, `9`, `latest` (*9.5/Dockerfile*)](https://github.com/docker-library/postgres/blob/9737ce4eeb7d580de8bd6831d8144ba08c316197/9.5/Dockerfile) 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). diff --git a/python/README.md b/python/README.md index 6aeffa56d..7070cdbe4 100644 --- a/python/README.md +++ b/python/README.md @@ -1,8 +1,9 @@ # Supported tags and respective `Dockerfile` links -- [`2.7.11`, `2.7`, `2` (*2.7/Dockerfile*)](https://github.com/docker-library/python/blob/033320b278e78732e5739f19bca5f8f29573b553/2.7/Dockerfile) +- [`2.7.11`, `2.7`, `2` (*2.7/Dockerfile*)](https://github.com/docker-library/python/blob/326d146f38fd2bbdaed8c37442a81d6486b5bf2b/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/033320b278e78732e5739f19bca5f8f29573b553/2.7/slim/Dockerfile) +- [`2.7.11-slim`, `2.7-slim`, `2-slim` (*2.7/slim/Dockerfile*)](https://github.com/docker-library/python/blob/326d146f38fd2bbdaed8c37442a81d6486b5bf2b/2.7/slim/Dockerfile) +- [`2.7.11-alpine`, `2.7-alpine`, `2-alpine` (*2.7/alpine/Dockerfile*)](https://github.com/docker-library/python/blob/326d146f38fd2bbdaed8c37442a81d6486b5bf2b/2.7/alpine/Dockerfile) - [`2.7.11-wheezy`, `2.7-wheezy`, `2-wheezy` (*2.7/wheezy/Dockerfile*)](https://github.com/docker-library/python/blob/033320b278e78732e5739f19bca5f8f29573b553/2.7/wheezy/Dockerfile) - [`3.2.6`, `3.2` (*3.2/Dockerfile*)](https://github.com/docker-library/python/blob/033320b278e78732e5739f19bca5f8f29573b553/3.2/Dockerfile) - [`3.2.6-onbuild`, `3.2-onbuild` (*3.2/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/7663560df7547e69d13b1b548675502f4e0917d1/3.2/onbuild/Dockerfile) @@ -16,10 +17,10 @@ - [`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/033320b278e78732e5739f19bca5f8f29573b553/3.4/slim/Dockerfile) - [`3.4.4-wheezy`, `3.4-wheezy` (*3.4/wheezy/Dockerfile*)](https://github.com/docker-library/python/blob/033320b278e78732e5739f19bca5f8f29573b553/3.4/wheezy/Dockerfile) -- [`3.5.1`, `3.5`, `3`, `latest` (*3.5/Dockerfile*)](https://github.com/docker-library/python/blob/9c5b00f106e87639857134945d87fc7fca5e02f9/3.5/Dockerfile) +- [`3.5.1`, `3.5`, `3`, `latest` (*3.5/Dockerfile*)](https://github.com/docker-library/python/blob/326d146f38fd2bbdaed8c37442a81d6486b5bf2b/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/9c5b00f106e87639857134945d87fc7fca5e02f9/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/5980eb7c3975e3a56235bae6ed116f0f2d85cb3c/3.5/alpine/Dockerfile) +- [`3.5.1-slim`, `3.5-slim`, `3-slim`, `slim` (*3.5/slim/Dockerfile*)](https://github.com/docker-library/python/blob/326d146f38fd2bbdaed8c37442a81d6486b5bf2b/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/326d146f38fd2bbdaed8c37442a81d6486b5bf2b/3.5/alpine/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). diff --git a/redis/README.md b/redis/README.md index ac50991f9..c5a8465f7 100644 --- a/redis/README.md +++ b/redis/README.md @@ -4,6 +4,7 @@ - [`2.8.23-32bit`, `2.8-32bit`, `2-32bit` (*2.8/32bit/Dockerfile*)](https://github.com/docker-library/redis/blob/7d9f53256f8e13aa4dff2112145c69c22f8ce394/2.8/32bit/Dockerfile) - [`3.0.6`, `3.0`, `3`, `latest` (*3.0/Dockerfile*)](https://github.com/docker-library/redis/blob/7d9f53256f8e13aa4dff2112145c69c22f8ce394/3.0/Dockerfile) - [`3.0.6-32bit`, `3.0-32bit`, `3-32bit`, `32bit` (*3.0/32bit/Dockerfile*)](https://github.com/docker-library/redis/blob/7d9f53256f8e13aa4dff2112145c69c22f8ce394/3.0/32bit/Dockerfile) +- [`3.0.6-alpine`, `3.0-alpine`, `3-alpine`, `alpine` (*3.0/alpine/Dockerfile*)](https://github.com/docker-library/redis/blob/18e13f767bd396c53aa1f0071b218816110060ac/3.0/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). @@ -71,6 +72,22 @@ 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.