Run update.sh

2018-04-25 18:09:12 +00:00 · 2018-04-25 18:09:12 +00:00 · be29b85bf9
parent 8a60bb066b
commit be29b85bf9
6 changed files with 133 additions and 9 deletions
--- a/amazonlinux/README.md
+++ b/amazonlinux/README.md
@ -18,8 +18,10 @@ WARNING:

 -	[`2017.12.0.20180330`, `2017.12`, `2` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/91cc3997375a8055ae62ffa2635acc464ec8ac51/Dockerfile)
 -	[`2017.12.0.20180330-with-sources`, `2017.12-with-sources`, `2-with-sources` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/9129377feea1176b636427b295e8af57656db079/Dockerfile)
-	[`2017.09.1.20180409`, `2017.09`, `1`, `latest` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/0b2dad813345cab464c6c0a716aa5be2ae072f79/Dockerfile)
-	[`2017.09.1.20180409-with-sources`, `2017.09-with-sources`, `1-with-sources`, `with-sources` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/6d5273cf53b85c27690ac394bee2c2935cca73b8/Dockerfile)
+-	[`2018.03.0.20180424`, `2018.03`, `1`, `latest` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/2d98947f57ed4afe97daef60f4c05ec5e4adc69d/Dockerfile)
+-	[`2018.03.0.20180424-with-sources`, `2018.03-with-sources`, `1-with-sources`, `with-sources` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/e323bc6480b6eb08de5ed48f5d049aa04dcef7d3/Dockerfile)
+-	[`2017.09.1.20180409`, `2017.09` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/0b2dad813345cab464c6c0a716aa5be2ae072f79/Dockerfile)
+-	[`2017.09.1.20180409-with-sources`, `2017.09-with-sources` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/6d5273cf53b85c27690ac394bee2c2935cca73b8/Dockerfile)
 -	[`2017.03.1.20170812`, `2017.03` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/577139a6f2571e3adb59cfd34d61bc07e2fba238/Dockerfile)
 -	[`2017.03.1.20170812-with-sources`, `2017.03-with-sources` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/47f91aec4a189232a7feb1ec544a3a6af0347113/Dockerfile)
 -	[`2016.09.1.20161221`, `2016.09` (*Dockerfile*)](https://github.com/aws/amazon-linux-docker-images/blob/e1b56e68ebd2b274c64e0a0a18ae0a9a8122822d/Dockerfile)
--- a/erlang/README.md
+++ b/erlang/README.md
@ -17,12 +17,12 @@ WARNING:
 # Supported tags and respective `Dockerfile` links

 -	[`20.3.4`, `20.3`, `20`, `latest` (*20/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/4445312ead7e1b449edf7a2eda8d058da7b6a2a7/20/Dockerfile)
-	[`20.3.4-slim`, `20.3-slim`, `20-slim`, `slim` (*20/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/4445312ead7e1b449edf7a2eda8d058da7b6a2a7/20/slim/Dockerfile)
+-	[`20.3.4-slim`, `20.3-slim`, `20-slim`, `slim` (*20/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/54c69cb6eff65503f09897072c72ff2d138d1e62/20/slim/Dockerfile)
 -	[`20.3.4-alpine`, `20.3-alpine`, `20-alpine`, `alpine` (*20/alpine/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/4445312ead7e1b449edf7a2eda8d058da7b6a2a7/20/alpine/Dockerfile)
 -	[`19.3.6.8`, `19.3.6`, `19.3`, `19` (*19/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/a4b3ffe77b67f6330f72f5aef7c639c985fdad94/19/Dockerfile)
 -	[`19.3.6.8-slim`, `19.3.6-slim`, `19.3-slim`, `19-slim` (*19/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/a4b3ffe77b67f6330f72f5aef7c639c985fdad94/19/slim/Dockerfile)
-	[`18.3.4.8`, `18.3.4`, `18.3`, `18` (*18/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/354f85db09d403e3d970d0731b811c774086ef26/18/Dockerfile)
-	[`18.3.4.8-slim`, `18.3.4-slim`, `18.3-slim`, `18-slim` (*18/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/354f85db09d403e3d970d0731b811c774086ef26/18/slim/Dockerfile)
+-	[`18.3.4.9`, `18.3.4`, `18.3`, `18` (*18/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/f4198d6fc95719ebb3c2c3cd66407c78f4aa3f49/18/Dockerfile)
+-	[`18.3.4.9-slim`, `18.3.4-slim`, `18.3-slim`, `18-slim` (*18/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/f4198d6fc95719ebb3c2c3cd66407c78f4aa3f49/18/slim/Dockerfile)
 -	[`17.5.6.9`, `17.5.6`, `17.5`, `17` (*17/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/a75738f344af1f177f828cbaa6e8a44d15749d5a/17/Dockerfile)
 -	[`17.5.6.9-slim`, `17.5.6-slim`, `17.5-slim`, `17-slim` (*17/slim/Dockerfile*)](https://github.com/c0b/docker-erlang-otp/blob/a75738f344af1f177f828cbaa6e8a44d15749d5a/17/slim/Dockerfile)

--- a/kong/README.md
+++ b/kong/README.md
@ -16,8 +16,8 @@ WARNING:

 # Supported tags and respective `Dockerfile` links

-	[`0.13.0-alpine`, `0.13.0`, `latest` (*alpine/Dockerfile*)](https://github.com/Kong/docker-kong/blob/914bba64bc7e1580b0e7e64e082459ca0c4e7eb7/alpine/Dockerfile)
-	[`0.13.0-centos` (*centos/Dockerfile*)](https://github.com/Kong/docker-kong/blob/914bba64bc7e1580b0e7e64e082459ca0c4e7eb7/centos/Dockerfile)
+-	[`0.13.1-alpine`, `0.13.1`, `0.13`, `latest` (*alpine/Dockerfile*)](https://github.com/Kong/docker-kong/blob/6e2035c5739482f0616021a7eda04ec6809d9f3e/alpine/Dockerfile)
+-	[`0.13.1-centos`, `0.13-centos` (*centos/Dockerfile*)](https://github.com/Kong/docker-kong/blob/6e2035c5739482f0616021a7eda04ec6809d9f3e/centos/Dockerfile)
 -	[`0.12-alpine`, `0.12.3-alpine` (*alpine/Dockerfile*)](https://github.com/Kong/docker-kong/blob/95f9e8ebfd735f4ab09af71bf060d200a9a7a981/alpine/Dockerfile)
 -	[`0.12-centos`, `0.12.3-centos`, `0.12`, `0.12.3` (*centos/Dockerfile*)](https://github.com/Kong/docker-kong/blob/95f9e8ebfd735f4ab09af71bf060d200a9a7a981/centos/Dockerfile)
 -	[`0.11-alpine`, `0.11.2-alpine` (*alpine/Dockerfile*)](https://github.com/Kong/docker-kong/blob/2ed0fad88ed81623ea4afb2111033a9d87f3c03c/alpine/Dockerfile)
--- a/matomo/README.md
+++ b/matomo/README.md
@ -0,0 +1,119 @@
+<!--
+
+********************************************************************************
+
+WARNING:
+
+    DO NOT EDIT "matomo/README.md"
+
+    IT IS AUTO-GENERATED
+
+    (from the other files in "matomo/" combined with a set of templates)
+
+********************************************************************************
+
+-->
+
+# Supported tags and respective `Dockerfile` links
+
+-	[`3.4.0-apache`, `3.4-apache`, `3-apache`, `3.4.0`, `3.4`, `3` (*apache/Dockerfile*)](https://github.com/matomo-org/docker/blob/c985c710bcd7ff07a79efd60433bc7f0d1674c28/apache/Dockerfile)
+-	[`3.4.0-fpm`, `3.4-fpm`, `3-fpm` (*fpm/Dockerfile*)](https://github.com/matomo-org/docker/blob/c985c710bcd7ff07a79efd60433bc7f0d1674c28/fpm/Dockerfile)
+
+# Quick reference
+
+-	**Where to get help**:  
+	[the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://blog.docker.com/2016/11/introducing-docker-community-directory-docker-community-slack/), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker)
+
+-	**Where to file issues**:  
+	[https://github.com/matomo-org/docker/issues](https://github.com/matomo-org/docker/issues)
+
+-	**Maintained by**:  
+	[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/)
+
+-	**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))  
+	(image metadata, transfer size, etc)
+
+-	**Image updates**:  
+	[official-images PRs with label `library/matomo`](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fmatomo)  
+	[official-images repo's `library/matomo` file](https://github.com/docker-library/official-images/blob/master/library/matomo) ([history](https://github.com/docker-library/official-images/commits/master/library/matomo))
+
+-	**Source of this description**:  
+	[docs repo's `matomo/` directory](https://github.com/docker-library/docs/tree/master/matomo) ([history](https://github.com/docker-library/docs/commits/master/matomo))
+
+-	**Supported Docker versions**:  
+	[the latest release](https://github.com/docker/docker-ce/releases/latest) (down to 1.6 on a best-effort basis)
+
+# Matomo (formerly Piwik)
+
+[![Build Status](https://travis-ci.org/matomo-org/docker.svg?branch=master)](https://travis-ci.org/matomo-org/docker) [Matomo](https://matomo.org/) (formerly Piwik) is the leading open-source analytics platform that gives you more than just powerful analytics:
+
+-	Free open-source software
+-	100% data ownership
+-	User privacy protection
+-	User-centric insights
+-	Customisable and extensible
+
+![logo](https://raw.githubusercontent.com/docker-library/docs/955ef68222b4466509ca877daab484bc0095afcf/matomo/logo.png)
+
+## Usage
+
+In keeping with a 'pure' micro-services approach, this image runs a Matomo service only (in the form of FastCGI). Because of that it **must** be used with companion containers which provide a database for data storage and HTTP to FastCGI proxy/translation services for the user interface.
+
+## Runtime
+
+You can run the Matomo container and service like so:
+
+```console
+docker run -d --link some-mysql:db matomo
+```
+
+This assumes you've already launched a suitable MySQL or MariaDB database container.
+
+You'll now need to use a suitable reverse proxy to access the user interface; which is available on TCP port 9000. Nginx provides the necessary functions for translation between HTTP and FastCGI.
+
+## Matomo Installation
+
+Once you're up and running, you'll arrive at the configuration wizard page. If you're using the compose file, at the `Database Setup` step, please enter the following:
+
+-	Database Server: `db`
+-	Login: `root`
+-	Password: MYSQL_ROOT_PASSWORD
+-	Database Name: piwik (or you can choose)
+
+And leave the rest as default.
+
+Then you can continue the installation with the super user.
+
+## Docker-compose examples and log import instructions
+
+A minimal set-up using docker-compose is available in the [.examples folder](https://github.com/matomo-org/docker/tree/master/.examples).
+
+If you want to use the import logs script, you can then run the following container as needed, in order to execute the python import logs script:
+
+```console
+docker run --rm --volumes-from="matomo_app_1" --link matomo_app_1 python:2-alpine python /var/www/html/misc/log-analytics/import_logs.py --url=http://ip.of.your.piwik --login=yourlogin --password=yourpassword --idsite=1 --recorders=4 /var/www/html/logs/access.log
+```
+
+## Contribute
+
+Pull requests are very welcome!
+
+We'd love to hear your feedback and suggestions in the issue tracker: [github.com/motomo-org/docker/issues](https://github.com/matomo-org/docker/issues).
+
+## GeoIP
+
+This product includes GeoLite data created by MaxMind, available from [http://www.maxmind.com](http://www.maxmind.com).
+
+# License
+
+View [license information](https://github.com/matomo-org/matomo/blob/master/LEGALNOTICE) for the software contained in this image.
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+Some additional license information which was able to be auto-detected might be found in [the `repo-info` repository's `matomo/` directory](https://github.com/docker-library/repo-info/tree/master/repos/matomo).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within.
--- a/piwik/README.md
+++ b/piwik/README.md
@ -14,6 +14,10 @@ WARNING:

 -->

+# **DEPRECATION NOTICE**
+
+This image is officially deprecated in favor of [the `matomo` image](https://hub.docker.com/_/matomo/), and will receive no further updates after 2018-09-30 (Sep 30, 2018). Please adjust your usage accordingly.
+
 # Supported tags and respective `Dockerfile` links

 -	[`3.4.0-apache`, `3.4-apache`, `3-apache`, `3.4.0`, `3.4`, `3` (*apache/Dockerfile*)](https://github.com/matomo-org/docker/blob/c985c710bcd7ff07a79efd60433bc7f0d1674c28/apache/Dockerfile)
--- a/teamspeak/README.md
+++ b/teamspeak/README.md
@ -16,8 +16,7 @@ WARNING:

 # Supported tags and respective `Dockerfile` links

-	[`3.1`, `3.1.1`, `latest` (*3.1.1/Dockerfile*)](https://github.com/TeamSpeak-Systems/teamspeak-linux-docker-images/blob/0acf85c990d8289ab5b4c51c1583df4437271995/3.1.1/Dockerfile)
-	[`3.1.0` (*3.1.0/Dockerfile*)](https://github.com/TeamSpeak-Systems/teamspeak-linux-docker-images/blob/29dd9a63a4ade302705d3643bc507605c5e4dfe0/3.1.0/Dockerfile)
+-	[`3.1`, `3.1.2`, `latest` (*alpine/Dockerfile*)](https://github.com/TeamSpeak-Systems/teamspeak-linux-docker-images/blob/2d3e33931086e8576a5d06c933c444e03a0e1207/alpine/Dockerfile)

 # Quick reference