Run update.sh

ardeshir · May 11, 2016 · dc11c4d · dc11c4d
1 parent 0a69b72
commit dc11c4d
Showing 1 changed file with 25 additions and 4 deletions.
diff --git a/solr/README.md b/solr/README.md
@@ -1,10 +1,15 @@
 # Supported tags and respective `Dockerfile` links
 
--	[`5.3.2`, `5.3` (*5.3/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/5d6039fb7019b08d420b7bb90f76e8958dc32548/5.3/Dockerfile)
--	[`5.4.1`, `5.4` (*5.4/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/da35a589a6218f8fd0e83d61f8c14b201234c1ae/5.4/Dockerfile)
--	[`5.5.0`, `5.5`, `5`, `latest` (*5.5/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/2e1ccd64970c65e7dacfe33203963b315f665cc3/5.5/Dockerfile)
+-	[`5.3.2`, `5.3` (*5.3/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/904d84fcaa83082d8a1b7a93a980928700387ea5/5.3/Dockerfile)
+-	[`5.3.2-alpine`, `5.3-alpine` (*5.3/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/904d84fcaa83082d8a1b7a93a980928700387ea5/5.3/alpine/Dockerfile)
+-	[`5.4.1`, `5.4` (*5.4/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/904d84fcaa83082d8a1b7a93a980928700387ea5/5.4/Dockerfile)
+-	[`5.4.1-alpine`, `5.4-alpine` (*5.4/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/904d84fcaa83082d8a1b7a93a980928700387ea5/5.4/alpine/Dockerfile)
+-	[`5.5.1`, `5.5` (*5.5/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/ec304043980dc94eed93dfad39ab1761523dd3f5/5.5/Dockerfile)
+-	[`5.5.1-alpine`, `5.5-alpine` (*5.5/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/ec304043980dc94eed93dfad39ab1761523dd3f5/5.5/alpine/Dockerfile)
+-	[`6.0.0`, `6.0`, `6`, `latest` (*6.0/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/904d84fcaa83082d8a1b7a93a980928700387ea5/6.0/Dockerfile)
+-	[`6.0.0-alpine`, `6.0-alpine`, `6-alpine`, `alpine` (*6.0/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/904d84fcaa83082d8a1b7a93a980928700387ea5/6.0/alpine/Dockerfile)
 
-[![](https://badge.imagelayers.io/solr:latest.svg)](https://imagelayers.io/?images=solr:5.3.2,solr:5.4.1,solr:5.5.0)
+[![](https://badge.imagelayers.io/solr:latest.svg)](https://imagelayers.io/?images=solr:5.3.2,solr:5.3.2-alpine,solr:5.4.1,solr:5.4.1-alpine,solr:5.5.1,solr:5.5.1-alpine,solr:6.0.0,solr:6.0.0-alpine)
 
 For more information about this image and its history, please see [the relevant manifest file (`library/solr`)](https://github.com/docker-library/official-images/blob/master/library/solr). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fsolr).
 
@@ -85,6 +90,22 @@ This repository is available on [github.com/docker-solr/docker-solr](https://git
 
 This repository is based on (and replaces) `makuk66/docker-solr`, and has been sponsored by [Lucidworks](http://www.lucidworks.com/).
 
+# Image Variants
+
+The `solr` images come in many flavors, each designed for a specific use case.
+
+## `solr:<version>`
+
+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.
+
+## `solr: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
 
 Solr is licensed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0).