Browse Source

Run update.sh

Docker Library Bot 9 years ago
parent
commit
1b1491edc4
2 changed files with 24 additions and 7 deletions
  1. 21 4
      jetty/README.md
  2. 3 3
      swarm/README.md

+ 21 - 4
jetty/README.md

@@ -1,10 +1,11 @@
 # Supported tags and respective `Dockerfile` links
 
--	[`9.3.9`, `9.3`, `9`, `9.3.9-jre8`, `9.3-jre8`, `9-jre8`, `latest`, `jre8` (*9.3-jre8/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/1caf4d876f6ac6874a46c91a1762f3c1f90d848c/9.3-jre8/Dockerfile)
--	[`9.2.17`, `9.2`, `9.2.17-jre8`, `9.2-jre8` (*9.2-jre8/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/1caf4d876f6ac6874a46c91a1762f3c1f90d848c/9.2-jre8/Dockerfile)
--	[`9.2.17-jre7`, `9.2-jre7`, `9-jre7`, `jre7` (*9.2-jre7/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/1caf4d876f6ac6874a46c91a1762f3c1f90d848c/9.2-jre7/Dockerfile)
+-	[`9.3.9`, `9.3`, `9`, `9.3.9-jre8`, `9.3-jre8`, `9-jre8`, `latest`, `jre8` (*9.3-jre8/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/1ea4d8064136369ed2ec08fc5f4fbc3cae30c8d2/9.3-jre8/Dockerfile)
+-	[`9.3.9-alpine`, `9.3-alpine`, `9-alpine`, `9.3.9-jre8-alpine`, `9.3-jre8-alpine`, `9-jre8-alpine`, `alpine`, `jre8-alpine` (*9.3-jre8/alpine/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/1ea4d8064136369ed2ec08fc5f4fbc3cae30c8d2/9.3-jre8/alpine/Dockerfile)
+-	[`9.2.17`, `9.2`, `9.2.17-jre8`, `9.2-jre8` (*9.2-jre8/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/1ea4d8064136369ed2ec08fc5f4fbc3cae30c8d2/9.2-jre8/Dockerfile)
+-	[`9.2.17-jre7`, `9.2-jre7`, `9-jre7`, `jre7` (*9.2-jre7/Dockerfile*)](https://github.com/appropriate/docker-jetty/blob/1ea4d8064136369ed2ec08fc5f4fbc3cae30c8d2/9.2-jre7/Dockerfile)
 
-[![](https://badge.imagelayers.io/jetty:latest.svg)](https://imagelayers.io/?images=jetty:9.3.9,jetty:9.2.17,jetty:9.2.17-jre7)
+[![](https://badge.imagelayers.io/jetty:latest.svg)](https://imagelayers.io/?images=jetty:9.3.9,jetty:9.3.9-alpine,jetty:9.2.17,jetty:9.2.17-jre7)
 
 For more information about this image and its history, please see [the relevant manifest file (`library/jetty`)](https://github.com/docker-library/official-images/blob/master/library/jetty). 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%2Fjetty).
 
@@ -106,6 +107,22 @@ If you would like the image to start immediately as user `jetty` instead of star
 $ docker run -d -u jetty jetty
 ```
 
+# Image Variants
+
+The `jetty` images come in many flavors, each designed for a specific use case.
+
+## `jetty:<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.
+
+## `jetty: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://eclipse.org/jetty/licenses.php) for the software contained in this image.

+ 3 - 3
swarm/README.md

@@ -8,10 +8,10 @@
 -	[`1.1.3` (*Dockerfile*)](https://github.com/docker/swarm-library-image/blob/4d298d3113a4ecefa83a3f9e18f4aaf4f95f007e/Dockerfile)
 -	[`1.2.0` (*Dockerfile*)](https://github.com/docker/swarm-library-image/blob/0a35988bfcb18ed0aeb646b511e43e78bc940d07/Dockerfile)
 -	[`1.2.1` (*Dockerfile*)](https://github.com/docker/swarm-library-image/blob/9d4e009b40520720ceb270408b8078284df9513e/Dockerfile)
--	[`1.2.2`, `latest` (*Dockerfile*)](https://github.com/docker/swarm-library-image/blob/1f9089c40ac560e7b4c878ad6bd7803f4f061e82/Dockerfile)
--	[`1.2.3-rc1` (*Dockerfile*)](https://github.com/docker/swarm-library-image/blob/7f1d7c958f92b68cd2b99149daf19fd072852f77/Dockerfile)
+-	[`1.2.2` (*Dockerfile*)](https://github.com/docker/swarm-library-image/blob/1f9089c40ac560e7b4c878ad6bd7803f4f061e82/Dockerfile)
+-	[`1.2.3`, `latest` (*Dockerfile*)](https://github.com/docker/swarm-library-image/blob/a1b25fc6cd2a6175d17a8ae5241c31996e8faaa8/Dockerfile)
 
-[![](https://badge.imagelayers.io/swarm:latest.svg)](https://imagelayers.io/?images=swarm:1.0.0,swarm:1.0.1,swarm:1.1.0,swarm:1.1.1,swarm:1.1.2,swarm:1.1.3,swarm:1.2.0,swarm:1.2.1,swarm:1.2.2,swarm:1.2.3-rc1)
+[![](https://badge.imagelayers.io/swarm:latest.svg)](https://imagelayers.io/?images=swarm:1.0.0,swarm:1.0.1,swarm:1.1.0,swarm:1.1.1,swarm:1.1.2,swarm:1.1.3,swarm:1.2.0,swarm:1.2.1,swarm:1.2.2,swarm:1.2.3)
 
 For more information about this image and its history, please see [the relevant manifest file (`library/swarm`)](https://github.com/docker-library/official-images/blob/master/library/swarm). 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%2Fswarm).