浏览代码

Run update.sh

Docker Library Bot 7 年之前
父节点
当前提交
d3fb3ff96f
共有 3 个文件被更改,包括 44 次插入10 次删除
  1. 20 3
      matomo/README.md
  2. 20 3
      piwik/README.md
  3. 4 4
      sonarqube/README.md

+ 20 - 3
matomo/README.md

@@ -16,8 +16,9 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`3.5.0-apache`, `3.5-apache`, `3-apache`, `apache`, `3.5.0`, `3.5`, `3`, `latest` (*apache/Dockerfile*)](https://github.com/matomo-org/docker/blob/edd76a3640e34e8318f7dbb08b4875838cb83e0c/apache/Dockerfile)
--	[`3.5.0-fpm`, `3.5-fpm`, `3-fpm`, `fpm` (*fpm/Dockerfile*)](https://github.com/matomo-org/docker/blob/edd76a3640e34e8318f7dbb08b4875838cb83e0c/fpm/Dockerfile)
+-	[`3.5.1-apache`, `3.5-apache`, `3-apache`, `apache`, `3.5.1`, `3.5`, `3`, `latest` (*apache/Dockerfile*)](https://github.com/matomo-org/docker/blob/72bf7cd7dbe96b7caf38330e8e6f80d8596ab749/apache/Dockerfile)
+-	[`3.5.1-fpm`, `3.5-fpm`, `3-fpm`, `fpm` (*fpm/Dockerfile*)](https://github.com/matomo-org/docker/blob/72bf7cd7dbe96b7caf38330e8e6f80d8596ab749/fpm/Dockerfile)
+-	[`3.5.1-fpm-alpine`, `3.5-fpm-alpine`, `3-fpm-alpine`, `fpm-alpine` (*fpm-alpine/Dockerfile*)](https://github.com/matomo-org/docker/blob/88a8be3c7f386b2c21c8ef93f32aa092c5603ea1/fpm-alpine/Dockerfile)
 
 # Quick reference
 
@@ -31,7 +32,7 @@ WARNING:
 	[Matomo](https://github.com/matomo-org/docker) (a Matomo community contributor)
 
 -	**Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64))  
-	[`amd64`](https://hub.docker.com/r/amd64/matomo/), [`arm32v5`](https://hub.docker.com/r/arm32v5/matomo/), [`arm32v7`](https://hub.docker.com/r/arm32v7/matomo/), [`arm64v8`](https://hub.docker.com/r/arm64v8/matomo/), [`i386`](https://hub.docker.com/r/i386/matomo/), [`ppc64le`](https://hub.docker.com/r/ppc64le/matomo/), [`s390x`](https://hub.docker.com/r/s390x/matomo/)
+	[`amd64`](https://hub.docker.com/r/amd64/matomo/), [`arm32v5`](https://hub.docker.com/r/arm32v5/matomo/), [`arm32v6`](https://hub.docker.com/r/arm32v6/matomo/), [`arm32v7`](https://hub.docker.com/r/arm32v7/matomo/), [`arm64v8`](https://hub.docker.com/r/arm64v8/matomo/), [`i386`](https://hub.docker.com/r/i386/matomo/), [`ppc64le`](https://hub.docker.com/r/ppc64le/matomo/), [`s390x`](https://hub.docker.com/r/s390x/matomo/)
 
 -	**Published image artifact details**:  
 	[repo-info repo's `repos/matomo/` directory](https://github.com/docker-library/repo-info/blob/master/repos/matomo) ([history](https://github.com/docker-library/repo-info/commits/master/repos/matomo))  
@@ -108,6 +109,22 @@ We'd love to hear your feedback and suggestions in the issue tracker: [github.co
 
 This product includes GeoLite data created by MaxMind, available from [http://www.maxmind.com](http://www.maxmind.com).
 
+# Image Variants
+
+The `matomo` images come in many flavors, each designed for a specific use case.
+
+## `matomo:<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.
+
+## `matomo: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/matomo-org/matomo/blob/master/LEGALNOTICE) for the software contained in this image.

+ 20 - 3
piwik/README.md

@@ -20,8 +20,9 @@ This image is officially deprecated in favor of [the `matomo` image](https://hub
 
 # Supported tags and respective `Dockerfile` links
 
--	[`3.5.0-apache`, `3.5-apache`, `3-apache`, `apache`, `3.5.0`, `3.5`, `3`, `latest` (*apache/Dockerfile*)](https://github.com/matomo-org/docker/blob/edd76a3640e34e8318f7dbb08b4875838cb83e0c/apache/Dockerfile)
--	[`3.5.0-fpm`, `3.5-fpm`, `3-fpm`, `fpm` (*fpm/Dockerfile*)](https://github.com/matomo-org/docker/blob/edd76a3640e34e8318f7dbb08b4875838cb83e0c/fpm/Dockerfile)
+-	[`3.5.1-apache`, `3.5-apache`, `3-apache`, `apache`, `3.5.1`, `3.5`, `3`, `latest` (*apache/Dockerfile*)](https://github.com/matomo-org/docker/blob/72bf7cd7dbe96b7caf38330e8e6f80d8596ab749/apache/Dockerfile)
+-	[`3.5.1-fpm`, `3.5-fpm`, `3-fpm`, `fpm` (*fpm/Dockerfile*)](https://github.com/matomo-org/docker/blob/72bf7cd7dbe96b7caf38330e8e6f80d8596ab749/fpm/Dockerfile)
+-	[`3.5.1-fpm-alpine`, `3.5-fpm-alpine`, `3-fpm-alpine`, `fpm-alpine` (*fpm-alpine/Dockerfile*)](https://github.com/matomo-org/docker/blob/88a8be3c7f386b2c21c8ef93f32aa092c5603ea1/fpm-alpine/Dockerfile)
 
 # Quick reference
 
@@ -35,7 +36,7 @@ This image is officially deprecated in favor of [the `matomo` image](https://hub
 	[Piwik Analytics](https://github.com/piwik/docker-piwik)
 
 -	**Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64))  
-	[`amd64`](https://hub.docker.com/r/amd64/piwik/), [`arm32v5`](https://hub.docker.com/r/arm32v5/piwik/), [`arm32v7`](https://hub.docker.com/r/arm32v7/piwik/), [`arm64v8`](https://hub.docker.com/r/arm64v8/piwik/), [`i386`](https://hub.docker.com/r/i386/piwik/), [`ppc64le`](https://hub.docker.com/r/ppc64le/piwik/), [`s390x`](https://hub.docker.com/r/s390x/piwik/)
+	[`amd64`](https://hub.docker.com/r/amd64/piwik/), [`arm32v5`](https://hub.docker.com/r/arm32v5/piwik/), [`arm32v6`](https://hub.docker.com/r/arm32v6/piwik/), [`arm32v7`](https://hub.docker.com/r/arm32v7/piwik/), [`arm64v8`](https://hub.docker.com/r/arm64v8/piwik/), [`i386`](https://hub.docker.com/r/i386/piwik/), [`ppc64le`](https://hub.docker.com/r/ppc64le/piwik/), [`s390x`](https://hub.docker.com/r/s390x/piwik/)
 
 -	**Published image artifact details**:  
 	[repo-info repo's `repos/piwik/` directory](https://github.com/docker-library/repo-info/blob/master/repos/piwik) ([history](https://github.com/docker-library/repo-info/commits/master/repos/piwik))  
@@ -100,6 +101,22 @@ We'd love to hear your feedback and suggestions in the issue tracker: [github.co
 
 This product includes GeoLite data created by MaxMind, available from [http://www.maxmind.com](http://www.maxmind.com).
 
+# Image Variants
+
+The `piwik` images come in many flavors, each designed for a specific use case.
+
+## `piwik:<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.
+
+## `piwik: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/piwik/piwik/blob/master/LEGALNOTICE) for the software contained in this image.

+ 4 - 4
sonarqube/README.md

@@ -16,10 +16,10 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`6.7.3`, `lts` (*6.7.3/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/485e83c6354c984cf86dd2da08fb8de441df89f7/6.7.3/Dockerfile)
--	[`6.7.3-alpine`, `lts-alpine` (*6.7.3-alpine/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/485e83c6354c984cf86dd2da08fb8de441df89f7/6.7.3-alpine/Dockerfile)
--	[`7.1`, `latest` (*7.1/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/485e83c6354c984cf86dd2da08fb8de441df89f7/7.1/Dockerfile)
--	[`7.1-alpine`, `alpine` (*7.1-alpine/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/485e83c6354c984cf86dd2da08fb8de441df89f7/7.1-alpine/Dockerfile)
+-	[`6.7.4`, `lts` (*6.7.4/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/5d695dae7e2c5565e6dd09991a719fae5f5cefec/6.7.4/Dockerfile)
+-	[`6.7.4-alpine`, `lts-alpine` (*6.7.4-alpine/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/5d695dae7e2c5565e6dd09991a719fae5f5cefec/6.7.4-alpine/Dockerfile)
+-	[`7.1`, `latest` (*7.1/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/5d695dae7e2c5565e6dd09991a719fae5f5cefec/7.1/Dockerfile)
+-	[`7.1-alpine`, `alpine` (*7.1-alpine/Dockerfile*)](https://github.com/SonarSource/docker-sonarqube/blob/5d695dae7e2c5565e6dd09991a719fae5f5cefec/7.1-alpine/Dockerfile)
 
 # Quick reference