Update Matomo #19781
Merged
Update Matomo #19781
Conversation
This file contains hidden or 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 for 5d3e812:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 3616e93..a37aa8b 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -4,7 +4,6 @@ arm32v6
arm32v7
arm64v8
i386
-mips64le
ppc64le
riscv64
s390x
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 03ccafe..fe6ee3a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,17 +1,17 @@
Maintainers: Matomo Community (@matomo-org)
GitRepo: https://github.com/matomo-org/docker.git
-Tags: 5.3.2-apache, 5.3-apache, 5-apache, apache, 5.3.2, 5.3, 5, latest
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 82fa89f13413cae2cc185416dce5ce4a6baeb618
+Tags: 5.4.0-apache, 5.4-apache, 5-apache, apache, 5.4.0, 5.4, 5, latest
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 46b01bfa1022b82747b1dabe83ecf2d559fb9829
Directory: apache
-Tags: 5.3.2-fpm, 5.3-fpm, 5-fpm, fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 82fa89f13413cae2cc185416dce5ce4a6baeb618
+Tags: 5.4.0-fpm, 5.4-fpm, 5-fpm, fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 46b01bfa1022b82747b1dabe83ecf2d559fb9829
Directory: fpm
-Tags: 5.3.2-fpm-alpine, 5.3-fpm-alpine, 5-fpm-alpine, fpm-alpine
+Tags: 5.4.0-fpm-alpine, 5.4-fpm-alpine, 5-fpm-alpine, fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 82fa89f13413cae2cc185416dce5ce4a6baeb618
+GitCommit: 1a3faf94ab6b22ca27b3dcce0026744dbb9969f3
Directory: fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 1826bc8..0886d33 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,14 +2,14 @@ matomo:5
matomo:5-apache
matomo:5-fpm
matomo:5-fpm-alpine
-matomo:5.3
-matomo:5.3-apache
-matomo:5.3-fpm
-matomo:5.3-fpm-alpine
-matomo:5.3.2
-matomo:5.3.2-apache
-matomo:5.3.2-fpm
-matomo:5.3.2-fpm-alpine
+matomo:5.4
+matomo:5.4-apache
+matomo:5.4-fpm
+matomo:5.4-fpm-alpine
+matomo:5.4.0
+matomo:5.4.0-apache
+matomo:5.4.0-fpm
+matomo:5.4.0-fpm-alpine
matomo:apache
matomo:fpm
matomo:fpm-alpine
diff --git a/matomo_fpm-alpine/Dockerfile b/matomo_fpm-alpine/Dockerfile
index 0fdaa05..7c62b51 100644
--- a/matomo_fpm-alpine/Dockerfile
+++ b/matomo_fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-fpm-alpine
+FROM php:8.4-fpm-alpine
ENV PHP_MEMORY_LIMIT=256M
@@ -24,14 +24,13 @@ RUN set -ex; \
bcmath \
ldap \
mysqli \
- opcache \
pdo_mysql \
zip \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
- pecl install APCu-5.1.24; \
- pecl install redis-6.1.0; \
+ pecl install APCu-5.1.27; \
+ pecl install redis-6.2.0; \
\
docker-php-ext-enable \
apcu \
@@ -58,7 +57,7 @@ RUN { \
echo 'opcache.fast_shutdown=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
-ENV MATOMO_VERSION 5.3.2
+ENV MATOMO_VERSION 5.4.0
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/matomo_fpm/Dockerfile b/matomo_fpm/Dockerfile
index e57cada..5a6bd6e 100644
--- a/matomo_fpm/Dockerfile
+++ b/matomo_fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-fpm
+FROM php:8.4-fpm
ENV PHP_MEMORY_LIMIT=256M
@@ -24,14 +24,13 @@ RUN set -ex; \
bcmath \
ldap \
mysqli \
- opcache \
pdo_mysql \
zip \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
- pecl install APCu-5.1.24; \
- pecl install redis-6.1.0; \
+ pecl install APCu-5.1.27; \
+ pecl install redis-6.2.0; \
\
docker-php-ext-enable \
apcu \
@@ -45,13 +44,14 @@ RUN set -ex; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -rt apt-mark manual; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
@@ -63,7 +63,7 @@ RUN { \
echo 'opcache.fast_shutdown=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
-ENV MATOMO_VERSION 5.3.2
+ENV MATOMO_VERSION 5.4.0
RUN set -ex; \
fetchDeps=" \
@@ -87,7 +87,7 @@ RUN set -ex; \
tar -xzf matomo.tar.gz -C /usr/src/; \
rm matomo.tar.gz; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
COPY php.ini /usr/local/etc/php/conf.d/php-matomo.ini
diff --git a/matomo_latest/Dockerfile b/matomo_latest/Dockerfile
index 54f984c..8cb407f 100644
--- a/matomo_latest/Dockerfile
+++ b/matomo_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-apache
+FROM php:8.4-apache
ENV PHP_MEMORY_LIMIT=256M
@@ -24,14 +24,13 @@ RUN set -ex; \
bcmath \
ldap \
mysqli \
- opcache \
pdo_mysql \
zip \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
- pecl install APCu-5.1.24; \
- pecl install redis-6.1.0; \
+ pecl install APCu-5.1.27; \
+ pecl install redis-6.2.0; \
\
docker-php-ext-enable \
apcu \
@@ -45,13 +44,14 @@ RUN set -ex; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -rt apt-mark manual; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
@@ -63,7 +63,7 @@ RUN { \
echo 'opcache.fast_shutdown=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
-ENV MATOMO_VERSION 5.3.2
+ENV MATOMO_VERSION 5.4.0
RUN set -ex; \
fetchDeps=" \
@@ -87,7 +87,7 @@ RUN set -ex; \
tar -xzf matomo.tar.gz -C /usr/src/; \
rm matomo.tar.gz; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
COPY php.ini /usr/local/etc/php/conf.d/php-matomo.iniRelevant Maintainers:
|
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.
No description provided.