Update matomo

[tianon]

Changes:

• matomo-org/docker@c3bc18c: Update to 3.10.0
• matomo-org/docker@30bc7cb: Update README.md
• matomo-org/docker@96f9711: Update README.md
• matomo-org/docker@5268c9f: Merge pull request Modernize docker-compose.yml matomo-org/docker#157 from J0WI/compose
• matomo-org/docker@53f0171: Merge pull request Add OPcache config matomo-org/docker#160 from J0WI/opcache
• matomo-org/docker@f394d81: Add OPcache config
• matomo-org/docker@e31357a: Merge pull request Use all available cores to build PHP extensions matomo-org/docker#159 from J0WI/nproc
• matomo-org/docker@fb43ebe: Use all available cores to build PHP extensions

[tianon]

Diff:

diff --git a/_bashbrew-list b/_bashbrew-list
index bd5c148..dc5bd4e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,14 +2,14 @@ matomo:3
 matomo:3-apache
 matomo:3-fpm
 matomo:3-fpm-alpine
-matomo:3.9
-matomo:3.9-apache
-matomo:3.9-fpm
-matomo:3.9-fpm-alpine
-matomo:3.9.1
-matomo:3.9.1-apache
-matomo:3.9.1-fpm
-matomo:3.9.1-fpm-alpine
+matomo:3.10
+matomo:3.10-apache
+matomo:3.10-fpm
+matomo:3.10-fpm-alpine
+matomo:3.10.0
+matomo:3.10.0-apache
+matomo:3.10.0-fpm
+matomo:3.10.0-fpm-alpine
 matomo:apache
 matomo:fpm
 matomo:fpm-alpine
diff --git a/matomo_fpm-alpine/Dockerfile b/matomo_fpm-alpine/Dockerfile
index 22ea003..3d16169 100644
--- a/matomo_fpm-alpine/Dockerfile
+++ b/matomo_fpm-alpine/Dockerfile
@@ -18,7 +18,7 @@ RUN set -ex; \
 	\
 	docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
 	docker-php-ext-configure ldap; \
-	docker-php-ext-install \
+	docker-php-ext-install -j "$(nproc)" \
 		gd \
 		ldap \
 		mysqli \
@@ -45,7 +45,17 @@ RUN set -ex; \
 	apk add --virtual .matomo-phpext-rundeps $runDeps; \
 	apk del .build-deps
 
-ENV MATOMO_VERSION 3.9.1
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=2'; \
+		echo 'opcache.fast_shutdown=1'; \
+	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+
+ENV MATOMO_VERSION 3.10.0
 
 RUN set -ex; \
 	apk add --no-cache --virtual .fetch-deps \
diff --git a/matomo_fpm/Dockerfile b/matomo_fpm/Dockerfile
index 9e68d2a..cde1de4 100644
--- a/matomo_fpm/Dockerfile
+++ b/matomo_fpm/Dockerfile
@@ -18,7 +18,7 @@ RUN set -ex; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-	docker-php-ext-install \
+	docker-php-ext-install -j "$(nproc)" \
 		gd \
 		ldap \
 		mysqli \
@@ -50,7 +50,17 @@ RUN set -ex; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	rm -rf /var/lib/apt/lists/*
 
-ENV MATOMO_VERSION 3.9.1
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=2'; \
+		echo 'opcache.fast_shutdown=1'; \
+	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+
+ENV MATOMO_VERSION 3.10.0
 
 RUN set -ex; \
 	fetchDeps=" \
diff --git a/matomo_latest/Dockerfile b/matomo_latest/Dockerfile
index e069656..eb8a6ae 100644
--- a/matomo_latest/Dockerfile
+++ b/matomo_latest/Dockerfile
@@ -18,7 +18,7 @@ RUN set -ex; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-	docker-php-ext-install \
+	docker-php-ext-install -j "$(nproc)" \
 		gd \
 		ldap \
 		mysqli \
@@ -50,7 +50,17 @@ RUN set -ex; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	rm -rf /var/lib/apt/lists/*
 
-ENV MATOMO_VERSION 3.9.1
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=2'; \
+		echo 'opcache.fast_shutdown=1'; \
+	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+
+ENV MATOMO_VERSION 3.10.0
 
 RUN set -ex; \
 	fetchDeps=" \

[tianon]

Build test of #6207; dce294e; amd64 (matomo):

$ bashbrew build matomo:3.10.0-apache
Building bashbrew/cache:071e64ffccb175368a35073d4372b003a62b91a68437dd6a99ed78860a0b35c2 (matomo:3.10.0-apache)
Tagging matomo:3.10.0-apache
Tagging matomo:3.10-apache
Tagging matomo:3-apache
Tagging matomo:apache
Tagging matomo:3.10.0
Tagging matomo:3.10
Tagging matomo:3
Tagging matomo:latest

$ test/run.sh matomo:3.10.0-apache
testing matomo:3.10.0-apache
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build matomo:3.10.0-fpm
Building bashbrew/cache:819df90e5953be847a33eac03b32a103e9a7f1368efe50e86ab62a982ca4d3d5 (matomo:3.10.0-fpm)
Tagging matomo:3.10.0-fpm
Tagging matomo:3.10-fpm
Tagging matomo:3-fpm
Tagging matomo:fpm

$ test/run.sh matomo:3.10.0-fpm
testing matomo:3.10.0-fpm
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build matomo:3.10.0-fpm-alpine
Building bashbrew/cache:5fcf5830d3d50a5f3048b3227fb89fe89ce057a2336a5a34c431f819e950f1ec (matomo:3.10.0-fpm-alpine)
Tagging matomo:3.10.0-fpm-alpine
Tagging matomo:3.10-fpm-alpine
Tagging matomo:3-fpm-alpine
Tagging matomo:fpm-alpine

$ test/run.sh matomo:3.10.0-fpm-alpine
testing matomo:3.10.0-fpm-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed