Matomo 3.13.1 #7285
Merged
Matomo 3.13.1 #7285
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff:diff --git a/_bashbrew-list b/_bashbrew-list
index 28517b8..a4acb5d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ matomo:3.13
matomo:3.13-apache
matomo:3.13-fpm
matomo:3.13-fpm-alpine
-matomo:3.13.0
-matomo:3.13.0-apache
-matomo:3.13.0-fpm
-matomo:3.13.0-fpm-alpine
+matomo:3.13.1
+matomo:3.13.1-apache
+matomo:3.13.1-fpm
+matomo:3.13.1-fpm-alpine
matomo:apache
matomo:fpm
matomo:fpm-alpine
diff --git a/matomo_fpm-alpine/Dockerfile b/matomo_fpm-alpine/Dockerfile
index bf3912b..96668a0 100644
--- a/matomo_fpm-alpine/Dockerfile
+++ b/matomo_fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-fpm-alpine
+FROM php:7.4-fpm-alpine
LABEL maintainer="pierre@piwik.org"
@@ -16,7 +16,7 @@ RUN set -ex; \
pcre-dev \
; \
\
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd --with-freetype --with-jpeg; \
docker-php-ext-configure ldap; \
docker-php-ext-install -j "$(nproc)" \
gd \
@@ -28,7 +28,7 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
- pecl install APCu-5.1.17; \
+ pecl install APCu-5.1.18; \
pecl install redis-4.3.0; \
\
docker-php-ext-enable \
@@ -55,7 +55,7 @@ RUN { \
echo 'opcache.fast_shutdown=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
-ENV MATOMO_VERSION 3.13.0
+ENV MATOMO_VERSION 3.13.1
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
@@ -77,16 +77,17 @@ RUN set -ex; \
COPY php.ini /usr/local/etc/php/conf.d/php-matomo.ini
-RUN set -ex; \
- curl -fsSL -o GeoIPCity.tar.gz \
- "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz"; \
- curl -fsSL -o GeoIPCity.tar.gz.md5 \
- "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz.md5"; \
- echo "$(cat GeoIPCity.tar.gz.md5) GeoIPCity.tar.gz" | md5sum -c -; \
- mkdir /usr/src/GeoIPCity; \
- tar -xf GeoIPCity.tar.gz -C /usr/src/GeoIPCity --strip-components=1; \
- mv /usr/src/GeoIPCity/GeoLite2-City.mmdb /usr/src/matomo/misc/GeoLite2-City.mmdb; \
- rm -rf GeoIPCity*
+# https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/
+#RUN set -ex; \
+# curl -fsSL -o GeoIPCity.tar.gz \
+# "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz"; \
+# curl -fsSL -o GeoIPCity.tar.gz.md5 \
+# "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz.md5"; \
+# echo "$(cat GeoIPCity.tar.gz.md5) GeoIPCity.tar.gz" | md5sum -c -; \
+# mkdir /usr/src/GeoIPCity; \
+# tar -xf GeoIPCity.tar.gz -C /usr/src/GeoIPCity --strip-components=1; \
+# mv /usr/src/GeoIPCity/GeoLite2-City.mmdb /usr/src/matomo/misc/GeoLite2-City.mmdb; \
+# rm -rf GeoIPCity*
COPY docker-entrypoint.sh /entrypoint.sh
diff --git a/matomo_fpm/Dockerfile b/matomo_fpm/Dockerfile
index b3b6e95..318a849 100644
--- a/matomo_fpm/Dockerfile
+++ b/matomo_fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-fpm
+FROM php:7.4-fpm
LABEL maintainer="pierre@piwik.org"
@@ -16,7 +16,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 gd --with-freetype --with-jpeg; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \
gd \
@@ -28,7 +28,7 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
- pecl install APCu-5.1.17; \
+ pecl install APCu-5.1.18; \
pecl install redis-4.3.0; \
\
docker-php-ext-enable \
@@ -60,7 +60,7 @@ RUN { \
echo 'opcache.fast_shutdown=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
-ENV MATOMO_VERSION 3.13.0
+ENV MATOMO_VERSION 3.13.1
RUN set -ex; \
fetchDeps=" \
@@ -88,16 +88,17 @@ RUN set -ex; \
COPY php.ini /usr/local/etc/php/conf.d/php-matomo.ini
-RUN set -ex; \
- curl -fsSL -o GeoIPCity.tar.gz \
- "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz"; \
- curl -fsSL -o GeoIPCity.tar.gz.md5 \
- "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz.md5"; \
- echo "$(cat GeoIPCity.tar.gz.md5) GeoIPCity.tar.gz" | md5sum -c -; \
- mkdir /usr/src/GeoIPCity; \
- tar -xf GeoIPCity.tar.gz -C /usr/src/GeoIPCity --strip-components=1; \
- mv /usr/src/GeoIPCity/GeoLite2-City.mmdb /usr/src/matomo/misc/GeoLite2-City.mmdb; \
- rm -rf GeoIPCity*
+# https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/
+#RUN set -ex; \
+# curl -fsSL -o GeoIPCity.tar.gz \
+# "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz"; \
+# curl -fsSL -o GeoIPCity.tar.gz.md5 \
+# "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz.md5"; \
+# echo "$(cat GeoIPCity.tar.gz.md5) GeoIPCity.tar.gz" | md5sum -c -; \
+# mkdir /usr/src/GeoIPCity; \
+# tar -xf GeoIPCity.tar.gz -C /usr/src/GeoIPCity --strip-components=1; \
+# mv /usr/src/GeoIPCity/GeoLite2-City.mmdb /usr/src/matomo/misc/GeoLite2-City.mmdb; \
+# rm -rf GeoIPCity*
COPY docker-entrypoint.sh /entrypoint.sh
diff --git a/matomo_latest/Dockerfile b/matomo_latest/Dockerfile
index 37dd988..3f64dca 100644
--- a/matomo_latest/Dockerfile
+++ b/matomo_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-apache
+FROM php:7.4-apache
LABEL maintainer="pierre@piwik.org"
@@ -16,7 +16,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 gd --with-freetype --with-jpeg; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \
gd \
@@ -28,7 +28,7 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
- pecl install APCu-5.1.17; \
+ pecl install APCu-5.1.18; \
pecl install redis-4.3.0; \
\
docker-php-ext-enable \
@@ -60,7 +60,7 @@ RUN { \
echo 'opcache.fast_shutdown=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
-ENV MATOMO_VERSION 3.13.0
+ENV MATOMO_VERSION 3.13.1
RUN set -ex; \
fetchDeps=" \
@@ -88,16 +88,17 @@ RUN set -ex; \
COPY php.ini /usr/local/etc/php/conf.d/php-matomo.ini
-RUN set -ex; \
- curl -fsSL -o GeoIPCity.tar.gz \
- "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz"; \
- curl -fsSL -o GeoIPCity.tar.gz.md5 \
- "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz.md5"; \
- echo "$(cat GeoIPCity.tar.gz.md5) GeoIPCity.tar.gz" | md5sum -c -; \
- mkdir /usr/src/GeoIPCity; \
- tar -xf GeoIPCity.tar.gz -C /usr/src/GeoIPCity --strip-components=1; \
- mv /usr/src/GeoIPCity/GeoLite2-City.mmdb /usr/src/matomo/misc/GeoLite2-City.mmdb; \
- rm -rf GeoIPCity*
+# https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/
+#RUN set -ex; \
+# curl -fsSL -o GeoIPCity.tar.gz \
+# "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz"; \
+# curl -fsSL -o GeoIPCity.tar.gz.md5 \
+# "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz.md5"; \
+# echo "$(cat GeoIPCity.tar.gz.md5) GeoIPCity.tar.gz" | md5sum -c -; \
+# mkdir /usr/src/GeoIPCity; \
+# tar -xf GeoIPCity.tar.gz -C /usr/src/GeoIPCity --strip-components=1; \
+# mv /usr/src/GeoIPCity/GeoLite2-City.mmdb /usr/src/matomo/misc/GeoLite2-City.mmdb; \
+# rm -rf GeoIPCity*
COPY docker-entrypoint.sh /entrypoint.sh
|
|
Build test of #7285; c9bffe8; $ bashbrew build matomo:3.13.1-apache
Building bashbrew/cache:70b28449d75c1a9498acd5cd6c41f6a25e48d9c15d0b312c20e798a7f97cc76a (matomo:3.13.1-apache)
Tagging matomo:3.13.1-apache
Tagging matomo:3.13-apache
Tagging matomo:3-apache
Tagging matomo:apache
Tagging matomo:3.13.1
Tagging matomo:3.13
Tagging matomo:3
Tagging matomo:latest
$ test/run.sh matomo:3.13.1-apache
testing matomo:3.13.1-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.13.1-fpm
Building bashbrew/cache:4c520cee4cac590b346e6815ac4a5c647b65275b6dfd4f51374be10cf51b7cc9 (matomo:3.13.1-fpm)
Tagging matomo:3.13.1-fpm
Tagging matomo:3.13-fpm
Tagging matomo:3-fpm
Tagging matomo:fpm
$ test/run.sh matomo:3.13.1-fpm
testing matomo:3.13.1-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.13.1-fpm-alpine
Building bashbrew/cache:2986f725def10bbc57cbb742a71a0ebbfa9ed83e6704ef337d1df82950993d78 (matomo:3.13.1-fpm-alpine)
Tagging matomo:3.13.1-fpm-alpine
Tagging matomo:3.13-fpm-alpine
Tagging matomo:3-fpm-alpine
Tagging matomo:fpm-alpine
$ test/run.sh matomo:3.13.1-fpm-alpine
testing matomo:3.13.1-fpm-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See also docker-library/docs#1641