Update Joomla! #16142
Merged
Update Joomla! #16142
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 for 2bc7a0d:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 66ca827..5d49000 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,92 +1,107 @@
Maintainers: Llewellyn van der Merwe <[email protected]> (@Llewellynvdm), Harald Leithner <[email protected]> (@HLeithner)
GitRepo: https://github.com/joomla-docker/docker-joomla.git
-Tags: 4.3.4, 4.3, 4.3.4-apache, 4.3-apache, 4.3.4-php8.1, 4.3-php8.1, 4.3.4-php8.1-apache, 4.3-php8.1-apache
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
-Directory: 4.3/php8.1/apache
-
-Tags: 4.3.4-php8.1-fpm, 4.3-php8.1-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
-Directory: 4.3/php8.1/fpm
-
-Tags: 4.3.4-php8.1-fpm-alpine, 4.3-php8.1-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
-Directory: 4.3/php8.1/fpm-alpine
-
-Tags: 4.3.4-php8.2-apache, 4.3-php8.2-apache
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
-Directory: 4.3/php8.2/apache
-
-Tags: 4.3.4-php8.2-fpm, 4.3-php8.2-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
-Directory: 4.3/php8.2/fpm
-
-Tags: 4.3.4-php8.2-fpm-alpine, 4.3-php8.2-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
-Directory: 4.3/php8.2/fpm-alpine
-
Tags: 4.4.2, 4.4, 4, latest, 4.4.2-apache, 4.4-apache, 4-apache, apache, 4.4.2-php8.1, 4.4-php8.1, 4-php8.1, php8.1, 4.4.2-php8.1-apache, 4.4-php8.1-apache, 4-php8.1-apache, php8.1-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
+GitCommit: c9cc3661ef0064e4b2242360ecce780ffc825daa
Directory: 4.4/php8.1/apache
Tags: 4.4.2-php8.1-fpm, 4.4-php8.1-fpm, 4-php8.1-fpm, php8.1-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
+GitCommit: c9cc3661ef0064e4b2242360ecce780ffc825daa
Directory: 4.4/php8.1/fpm
Tags: 4.4.2-php8.1-fpm-alpine, 4.4-php8.1-fpm-alpine, 4-php8.1-fpm-alpine, php8.1-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
+GitCommit: ed91ffe73eb0d47340f13345b9143fa2a1bed62a
Directory: 4.4/php8.1/fpm-alpine
Tags: 4.4.2-php8.2-apache, 4.4-php8.2-apache, 4-php8.2-apache, php8.2-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
+GitCommit: c9cc3661ef0064e4b2242360ecce780ffc825daa
Directory: 4.4/php8.2/apache
Tags: 4.4.2-php8.2-fpm, 4.4-php8.2-fpm, 4-php8.2-fpm, php8.2-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
+GitCommit: c9cc3661ef0064e4b2242360ecce780ffc825daa
Directory: 4.4/php8.2/fpm
Tags: 4.4.2-php8.2-fpm-alpine, 4.4-php8.2-fpm-alpine, 4-php8.2-fpm-alpine, php8.2-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
+GitCommit: ed91ffe73eb0d47340f13345b9143fa2a1bed62a
Directory: 4.4/php8.2/fpm-alpine
Tags: 5.0.2, 5.0, 5, 5.0.2-apache, 5.0-apache, 5-apache, 5.0.2-php8.2, 5.0-php8.2, 5-php8.2, 5.0.2-php8.2-apache, 5.0-php8.2-apache, 5-php8.2-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
+GitCommit: c9cc3661ef0064e4b2242360ecce780ffc825daa
Directory: 5.0/php8.2/apache
Tags: 5.0.2-php8.1-apache, 5.0-php8.1-apache, 5-php8.1-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
+GitCommit: c9cc3661ef0064e4b2242360ecce780ffc825daa
Directory: 5.0/php8.1/apache
Tags: 5.0.2-php8.1-fpm, 5.0-php8.1-fpm, 5-php8.1-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
+GitCommit: c9cc3661ef0064e4b2242360ecce780ffc825daa
Directory: 5.0/php8.1/fpm
Tags: 5.0.2-php8.1-fpm-alpine, 5.0-php8.1-fpm-alpine, 5-php8.1-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
+GitCommit: ed91ffe73eb0d47340f13345b9143fa2a1bed62a
Directory: 5.0/php8.1/fpm-alpine
Tags: 5.0.2-php8.2-fpm, 5.0-php8.2-fpm, 5-php8.2-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
+GitCommit: c9cc3661ef0064e4b2242360ecce780ffc825daa
Directory: 5.0/php8.2/fpm
Tags: 5.0.2-php8.2-fpm-alpine, 5.0-php8.2-fpm-alpine, 5-php8.2-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a416792606b1f49dfbe9ad2155c7df972ade09d3
+GitCommit: ed91ffe73eb0d47340f13345b9143fa2a1bed62a
Directory: 5.0/php8.2/fpm-alpine
+
+Tags: 5.1.0-alpha3, 5.1, 5.1.alpha, 5.1.0-alpha, 5.1.0-alpha3-apache, 5.1-apache, 5.1.alpha-apache, 5.1.0-alpha-apache, 5.1.0-alpha3-php8.2, 5.1-php8.2, 5.1.alpha-php8.2, 5.1.0-alpha-php8.2, 5.1.0-alpha3-php8.2-apache, 5.1-php8.2-apache, 5.1.alpha-php8.2-apache, 5.1.0-alpha-php8.2-apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 6432995076a6ae520ebaed5e1cdf737c522cd3fb
+Directory: 5.1.alpha/php8.2/apache
+
+Tags: 5.1.0-alpha3-php8.1-apache, 5.1-php8.1-apache, 5.1.alpha-php8.1-apache, 5.1.0-alpha-php8.1-apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 6432995076a6ae520ebaed5e1cdf737c522cd3fb
+Directory: 5.1.alpha/php8.1/apache
+
+Tags: 5.1.0-alpha3-php8.1-fpm, 5.1-php8.1-fpm, 5.1.alpha-php8.1-fpm, 5.1.0-alpha-php8.1-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 6432995076a6ae520ebaed5e1cdf737c522cd3fb
+Directory: 5.1.alpha/php8.1/fpm
+
+Tags: 5.1.0-alpha3-php8.1-fpm-alpine, 5.1-php8.1-fpm-alpine, 5.1.alpha-php8.1-fpm-alpine, 5.1.0-alpha-php8.1-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 6432995076a6ae520ebaed5e1cdf737c522cd3fb
+Directory: 5.1.alpha/php8.1/fpm-alpine
+
+Tags: 5.1.0-alpha3-php8.2-fpm, 5.1-php8.2-fpm, 5.1.alpha-php8.2-fpm, 5.1.0-alpha-php8.2-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 6432995076a6ae520ebaed5e1cdf737c522cd3fb
+Directory: 5.1.alpha/php8.2/fpm
+
+Tags: 5.1.0-alpha3-php8.2-fpm-alpine, 5.1-php8.2-fpm-alpine, 5.1.alpha-php8.2-fpm-alpine, 5.1.0-alpha-php8.2-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 6432995076a6ae520ebaed5e1cdf737c522cd3fb
+Directory: 5.1.alpha/php8.2/fpm-alpine
+
+Tags: 5.1.0-alpha3-php8.3-apache, 5.1-php8.3-apache, 5.1.alpha-php8.3-apache, 5.1.0-alpha-php8.3-apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 6432995076a6ae520ebaed5e1cdf737c522cd3fb
+Directory: 5.1.alpha/php8.3/apache
+
+Tags: 5.1.0-alpha3-php8.3-fpm, 5.1-php8.3-fpm, 5.1.alpha-php8.3-fpm, 5.1.0-alpha-php8.3-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 6432995076a6ae520ebaed5e1cdf737c522cd3fb
+Directory: 5.1.alpha/php8.3/fpm
+
+Tags: 5.1.0-alpha3-php8.3-fpm-alpine, 5.1-php8.3-fpm-alpine, 5.1.alpha-php8.3-fpm-alpine, 5.1.0-alpha-php8.3-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 6432995076a6ae520ebaed5e1cdf737c522cd3fb
+Directory: 5.1.alpha/php8.3/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index a1c928f..23a7d31 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -7,24 +7,6 @@ joomla:4-php8.1-fpm-alpine
joomla:4-php8.2-apache
joomla:4-php8.2-fpm
joomla:4-php8.2-fpm-alpine
-joomla:4.3
-joomla:4.3-apache
-joomla:4.3-php8.1
-joomla:4.3-php8.1-apache
-joomla:4.3-php8.1-fpm
-joomla:4.3-php8.1-fpm-alpine
-joomla:4.3-php8.2-apache
-joomla:4.3-php8.2-fpm
-joomla:4.3-php8.2-fpm-alpine
-joomla:4.3.4
-joomla:4.3.4-apache
-joomla:4.3.4-php8.1
-joomla:4.3.4-php8.1-apache
-joomla:4.3.4-php8.1-fpm
-joomla:4.3.4-php8.1-fpm-alpine
-joomla:4.3.4-php8.2-apache
-joomla:4.3.4-php8.2-fpm
-joomla:4.3.4-php8.2-fpm-alpine
joomla:4.4
joomla:4.4-apache
joomla:4.4-php8.1
@@ -70,6 +52,54 @@ joomla:5.0.2-php8.2
joomla:5.0.2-php8.2-apache
joomla:5.0.2-php8.2-fpm
joomla:5.0.2-php8.2-fpm-alpine
+joomla:5.1
+joomla:5.1.alpha
+joomla:5.1-apache
+joomla:5.1-php8.1-apache
+joomla:5.1-php8.1-fpm
+joomla:5.1-php8.1-fpm-alpine
+joomla:5.1-php8.2
+joomla:5.1-php8.2-apache
+joomla:5.1-php8.2-fpm
+joomla:5.1-php8.2-fpm-alpine
+joomla:5.1-php8.3-apache
+joomla:5.1-php8.3-fpm
+joomla:5.1-php8.3-fpm-alpine
+joomla:5.1.0-alpha
+joomla:5.1.0-alpha3
+joomla:5.1.0-alpha3-apache
+joomla:5.1.0-alpha3-php8.1-apache
+joomla:5.1.0-alpha3-php8.1-fpm
+joomla:5.1.0-alpha3-php8.1-fpm-alpine
+joomla:5.1.0-alpha3-php8.2
+joomla:5.1.0-alpha3-php8.2-apache
+joomla:5.1.0-alpha3-php8.2-fpm
+joomla:5.1.0-alpha3-php8.2-fpm-alpine
+joomla:5.1.0-alpha3-php8.3-apache
+joomla:5.1.0-alpha3-php8.3-fpm
+joomla:5.1.0-alpha3-php8.3-fpm-alpine
+joomla:5.1.0-alpha-apache
+joomla:5.1.0-alpha-php8.1-apache
+joomla:5.1.0-alpha-php8.1-fpm
+joomla:5.1.0-alpha-php8.1-fpm-alpine
+joomla:5.1.0-alpha-php8.2
+joomla:5.1.0-alpha-php8.2-apache
+joomla:5.1.0-alpha-php8.2-fpm
+joomla:5.1.0-alpha-php8.2-fpm-alpine
+joomla:5.1.0-alpha-php8.3-apache
+joomla:5.1.0-alpha-php8.3-fpm
+joomla:5.1.0-alpha-php8.3-fpm-alpine
+joomla:5.1.alpha-apache
+joomla:5.1.alpha-php8.1-apache
+joomla:5.1.alpha-php8.1-fpm
+joomla:5.1.alpha-php8.1-fpm-alpine
+joomla:5.1.alpha-php8.2
+joomla:5.1.alpha-php8.2-apache
+joomla:5.1.alpha-php8.2-fpm
+joomla:5.1.alpha-php8.2-fpm-alpine
+joomla:5.1.alpha-php8.3-apache
+joomla:5.1.alpha-php8.3-fpm
+joomla:5.1.alpha-php8.3-fpm-alpine
joomla:apache
joomla:latest
joomla:php8.1
diff --git a/joomla_5-php8.1-apache/Dockerfile b/joomla_5-php8.1-apache/Dockerfile
index c3df4d3..9703261 100644
--- a/joomla_5-php8.1-apache/Dockerfile
+++ b/joomla_5-php8.1-apache/Dockerfile
@@ -91,9 +91,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -115,7 +115,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -139,11 +138,11 @@ RUN set -eux; \
{ \
echo 'RemoteIPHeader X-Forwarded-For'; \
# these IP ranges are reserved for "private" use and should thus *usually* be safe inside Docker
- echo 'RemoteIPTrustedProxy 10.0.0.0/8'; \
- echo 'RemoteIPTrustedProxy 172.16.0.0/12'; \
- echo 'RemoteIPTrustedProxy 192.168.0.0/16'; \
- echo 'RemoteIPTrustedProxy 169.254.0.0/16'; \
- echo 'RemoteIPTrustedProxy 127.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
+ echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
+ echo 'RemoteIPInternalProxy 169.254.0.0/16'; \
+ echo 'RemoteIPInternalProxy 127.0.0.0/8'; \
} > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip; \
# (replace all instances of "%h" with "%a" in LogFormat)
diff --git a/joomla_5-php8.1-fpm-alpine/Dockerfile b/joomla_5-php8.1-fpm-alpine/Dockerfile
index 7d98677..d621c1d 100644
--- a/joomla_5-php8.1-fpm-alpine/Dockerfile
+++ b/joomla_5-php8.1-fpm-alpine/Dockerfile
@@ -113,7 +113,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
diff --git a/joomla_5-php8.1-fpm/Dockerfile b/joomla_5-php8.1-fpm/Dockerfile
index 42abeb4..a5e154c 100644
--- a/joomla_5-php8.1-fpm/Dockerfile
+++ b/joomla_5-php8.1-fpm/Dockerfile
@@ -91,9 +91,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -115,7 +115,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
diff --git a/joomla_5-php8.2-apache/Dockerfile b/joomla_5-php8.2-apache/Dockerfile
index 8c9b59f..f5dd441 100644
--- a/joomla_5-php8.2-apache/Dockerfile
+++ b/joomla_5-php8.2-apache/Dockerfile
@@ -91,9 +91,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -115,7 +115,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -139,11 +138,11 @@ RUN set -eux; \
{ \
echo 'RemoteIPHeader X-Forwarded-For'; \
# these IP ranges are reserved for "private" use and should thus *usually* be safe inside Docker
- echo 'RemoteIPTrustedProxy 10.0.0.0/8'; \
- echo 'RemoteIPTrustedProxy 172.16.0.0/12'; \
- echo 'RemoteIPTrustedProxy 192.168.0.0/16'; \
- echo 'RemoteIPTrustedProxy 169.254.0.0/16'; \
- echo 'RemoteIPTrustedProxy 127.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
+ echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
+ echo 'RemoteIPInternalProxy 169.254.0.0/16'; \
+ echo 'RemoteIPInternalProxy 127.0.0.0/8'; \
} > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip; \
# (replace all instances of "%h" with "%a" in LogFormat)
diff --git a/joomla_5-php8.2-fpm-alpine/Dockerfile b/joomla_5-php8.2-fpm-alpine/Dockerfile
index cfed627..c2d945e 100644
--- a/joomla_5-php8.2-fpm-alpine/Dockerfile
+++ b/joomla_5-php8.2-fpm-alpine/Dockerfile
@@ -113,7 +113,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
diff --git a/joomla_5-php8.2-fpm/Dockerfile b/joomla_5-php8.2-fpm/Dockerfile
index 935aeee..106747a 100644
--- a/joomla_5-php8.2-fpm/Dockerfile
+++ b/joomla_5-php8.2-fpm/Dockerfile
@@ -91,9 +91,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -115,7 +115,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
diff --git a/joomla_4.3-php8.1-apache/Dockerfile b/joomla_5.1.0-alpha-php8.1-apache/Dockerfile
similarity index 83%
rename from joomla_4.3-php8.1-apache/Dockerfile
rename to joomla_5.1.0-alpha-php8.1-apache/Dockerfile
index 38d0f42..3bad0f0 100644
--- a/joomla_4.3-php8.1-apache/Dockerfile
+++ b/joomla_5.1.0-alpha-php8.1-apache/Dockerfile
@@ -15,6 +15,8 @@ RUN set -eux; \
apt-get install -y --no-install-recommends \
# Ghostscript is required for rendering PDF previews
ghostscript \
+# Needed for the zst joomla package
+ zstd \
; \
rm -rf /var/lib/apt/lists/*
@@ -89,9 +91,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -113,7 +115,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -137,11 +138,11 @@ RUN set -eux; \
{ \
echo 'RemoteIPHeader X-Forwarded-For'; \
# these IP ranges are reserved for "private" use and should thus *usually* be safe inside Docker
- echo 'RemoteIPTrustedProxy 10.0.0.0/8'; \
- echo 'RemoteIPTrustedProxy 172.16.0.0/12'; \
- echo 'RemoteIPTrustedProxy 192.168.0.0/16'; \
- echo 'RemoteIPTrustedProxy 169.254.0.0/16'; \
- echo 'RemoteIPTrustedProxy 127.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
+ echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
+ echo 'RemoteIPInternalProxy 169.254.0.0/16'; \
+ echo 'RemoteIPInternalProxy 127.0.0.0/8'; \
} > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip; \
# (replace all instances of "%h" with "%a" in LogFormat)
@@ -150,16 +151,16 @@ RUN set -eux; \
VOLUME /var/www/html
# Define Joomla version and expected SHA512 signature
-ENV JOOMLA_VERSION 4.3.4
-ENV JOOMLA_SHA512 2efede3c3230d2fd849c46f84eea9aa1ef2bef6836e0ceec6451499bb6abf7e747d63f3996d0a5f7fc2d439c5ae0380e0e71f7c2823adfdda80e87a0bc377be1
+ENV JOOMLA_VERSION 5.1.0-alpha3
+ENV JOOMLA_SHA512 5d89702ba41741e635e5ac6065d8018b025a7910065b84ecc81a937530580c59430461c853b596c32f1fe45fe5ce4f9ca81669d6eb8d20df3e355f39bc486af4
# Download package and extract to web volume
RUN set -ex; \
- curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.4/Joomla_4.3.4-Stable-Full_Package.tar.bz2; \
- echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
+ curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0-alpha3/Joomla_5.1.0-alpha3-Alpha-Full_Package.tar.zst; \
+ echo "$JOOMLA_SHA512 *joomla.tar.zst" | sha512sum -c -; \
mkdir /usr/src/joomla; \
- tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
- rm joomla.tar.bz2; \
+ tar --zstd -xf joomla.tar.zst -C /usr/src/joomla; \
+ rm joomla.tar.zst; \
chown -R www-data:www-data /usr/src/joomla
# Copy init scripts
diff --git a/joomla_4.3-php8.1-apache/docker-entrypoint.sh b/joomla_5.1.0-alpha-php8.1-apache/docker-entrypoint.sh
similarity index 100%
copy from joomla_4.3-php8.1-apache/docker-entrypoint.sh
copy to joomla_5.1.0-alpha-php8.1-apache/docker-entrypoint.sh
diff --git a/joomla_4.3-php8.1-apache/makedb.php b/joomla_5.1.0-alpha-php8.1-apache/makedb.php
similarity index 100%
copy from joomla_4.3-php8.1-apache/makedb.php
copy to joomla_5.1.0-alpha-php8.1-apache/makedb.php
diff --git a/joomla_4.3-php8.1-fpm-alpine/Dockerfile b/joomla_5.1.0-alpha-php8.1-fpm-alpine/Dockerfile
similarity index 88%
rename from joomla_4.3-php8.1-fpm-alpine/Dockerfile
rename to joomla_5.1.0-alpha-php8.1-fpm-alpine/Dockerfile
index f5b48bf..a1fb8cb 100644
--- a/joomla_4.3-php8.1-fpm-alpine/Dockerfile
+++ b/joomla_5.1.0-alpha-php8.1-fpm-alpine/Dockerfile
@@ -18,6 +18,8 @@ RUN set -eux; \
ghostscript \
# Alpine package for "imagemagick" contains ~120 .so files
imagemagick \
+# Needed for the zst joomla package
+ zstd \
;
# install the PHP extensions we need.
@@ -111,7 +113,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -130,16 +131,16 @@ RUN { \
VOLUME /var/www/html
# Define Joomla version and expected SHA512 signature
-ENV JOOMLA_VERSION 4.3.4
-ENV JOOMLA_SHA512 2efede3c3230d2fd849c46f84eea9aa1ef2bef6836e0ceec6451499bb6abf7e747d63f3996d0a5f7fc2d439c5ae0380e0e71f7c2823adfdda80e87a0bc377be1
+ENV JOOMLA_VERSION 5.1.0-alpha3
+ENV JOOMLA_SHA512 5d89702ba41741e635e5ac6065d8018b025a7910065b84ecc81a937530580c59430461c853b596c32f1fe45fe5ce4f9ca81669d6eb8d20df3e355f39bc486af4
# Download package and extract to web volume
RUN set -ex; \
- curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.4/Joomla_4.3.4-Stable-Full_Package.tar.bz2; \
- echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
+ curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0-alpha3/Joomla_5.1.0-alpha3-Alpha-Full_Package.tar.zst; \
+ echo "$JOOMLA_SHA512 *joomla.tar.zst" | sha512sum -c -; \
mkdir /usr/src/joomla; \
- tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
- rm joomla.tar.bz2; \
+ tar --zstd -xf joomla.tar.zst -C /usr/src/joomla; \
+ rm joomla.tar.zst; \
chown -R www-data:www-data /usr/src/joomla
# Copy init scripts
diff --git a/joomla_4.3-php8.1-fpm-alpine/docker-entrypoint.sh b/joomla_5.1.0-alpha-php8.1-fpm-alpine/docker-entrypoint.sh
similarity index 100%
rename from joomla_4.3-php8.1-fpm-alpine/docker-entrypoint.sh
rename to joomla_5.1.0-alpha-php8.1-fpm-alpine/docker-entrypoint.sh
diff --git a/joomla_4.3-php8.1-fpm-alpine/makedb.php b/joomla_5.1.0-alpha-php8.1-fpm-alpine/makedb.php
similarity index 100%
rename from joomla_4.3-php8.1-fpm-alpine/makedb.php
rename to joomla_5.1.0-alpha-php8.1-fpm-alpine/makedb.php
diff --git a/joomla_4.3-php8.1-fpm/Dockerfile b/joomla_5.1.0-alpha-php8.1-fpm/Dockerfile
similarity index 85%
rename from joomla_4.3-php8.1-fpm/Dockerfile
rename to joomla_5.1.0-alpha-php8.1-fpm/Dockerfile
index e687133..d889738 100644
--- a/joomla_4.3-php8.1-fpm/Dockerfile
+++ b/joomla_5.1.0-alpha-php8.1-fpm/Dockerfile
@@ -15,6 +15,8 @@ RUN set -eux; \
apt-get install -y --no-install-recommends \
# Ghostscript is required for rendering PDF previews
ghostscript \
+# Needed for the zst joomla package
+ zstd \
; \
rm -rf /var/lib/apt/lists/*
@@ -89,9 +91,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -113,7 +115,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -132,16 +133,16 @@ RUN { \
VOLUME /var/www/html
# Define Joomla version and expected SHA512 signature
-ENV JOOMLA_VERSION 4.3.4
-ENV JOOMLA_SHA512 2efede3c3230d2fd849c46f84eea9aa1ef2bef6836e0ceec6451499bb6abf7e747d63f3996d0a5f7fc2d439c5ae0380e0e71f7c2823adfdda80e87a0bc377be1
+ENV JOOMLA_VERSION 5.1.0-alpha3
+ENV JOOMLA_SHA512 5d89702ba41741e635e5ac6065d8018b025a7910065b84ecc81a937530580c59430461c853b596c32f1fe45fe5ce4f9ca81669d6eb8d20df3e355f39bc486af4
# Download package and extract to web volume
RUN set -ex; \
- curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.4/Joomla_4.3.4-Stable-Full_Package.tar.bz2; \
- echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
+ curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0-alpha3/Joomla_5.1.0-alpha3-Alpha-Full_Package.tar.zst; \
+ echo "$JOOMLA_SHA512 *joomla.tar.zst" | sha512sum -c -; \
mkdir /usr/src/joomla; \
- tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
- rm joomla.tar.bz2; \
+ tar --zstd -xf joomla.tar.zst -C /usr/src/joomla; \
+ rm joomla.tar.zst; \
chown -R www-data:www-data /usr/src/joomla
# Copy init scripts
diff --git a/joomla_4.3-php8.1-fpm/docker-entrypoint.sh b/joomla_5.1.0-alpha-php8.1-fpm/docker-entrypoint.sh
similarity index 100%
rename from joomla_4.3-php8.1-fpm/docker-entrypoint.sh
rename to joomla_5.1.0-alpha-php8.1-fpm/docker-entrypoint.sh
diff --git a/joomla_4.3-php8.1-fpm/makedb.php b/joomla_5.1.0-alpha-php8.1-fpm/makedb.php
similarity index 100%
rename from joomla_4.3-php8.1-fpm/makedb.php
rename to joomla_5.1.0-alpha-php8.1-fpm/makedb.php
diff --git a/joomla_4.3-php8.2-apache/Dockerfile b/joomla_5.1.0-alpha-php8.2-apache/Dockerfile
similarity index 83%
rename from joomla_4.3-php8.2-apache/Dockerfile
rename to joomla_5.1.0-alpha-php8.2-apache/Dockerfile
index 1d32e01..9578ac0 100644
--- a/joomla_4.3-php8.2-apache/Dockerfile
+++ b/joomla_5.1.0-alpha-php8.2-apache/Dockerfile
@@ -15,6 +15,8 @@ RUN set -eux; \
apt-get install -y --no-install-recommends \
# Ghostscript is required for rendering PDF previews
ghostscript \
+# Needed for the zst joomla package
+ zstd \
; \
rm -rf /var/lib/apt/lists/*
@@ -89,9 +91,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -113,7 +115,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -137,11 +138,11 @@ RUN set -eux; \
{ \
echo 'RemoteIPHeader X-Forwarded-For'; \
# these IP ranges are reserved for "private" use and should thus *usually* be safe inside Docker
- echo 'RemoteIPTrustedProxy 10.0.0.0/8'; \
- echo 'RemoteIPTrustedProxy 172.16.0.0/12'; \
- echo 'RemoteIPTrustedProxy 192.168.0.0/16'; \
- echo 'RemoteIPTrustedProxy 169.254.0.0/16'; \
- echo 'RemoteIPTrustedProxy 127.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
+ echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
+ echo 'RemoteIPInternalProxy 169.254.0.0/16'; \
+ echo 'RemoteIPInternalProxy 127.0.0.0/8'; \
} > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip; \
# (replace all instances of "%h" with "%a" in LogFormat)
@@ -150,16 +151,16 @@ RUN set -eux; \
VOLUME /var/www/html
# Define Joomla version and expected SHA512 signature
-ENV JOOMLA_VERSION 4.3.4
-ENV JOOMLA_SHA512 2efede3c3230d2fd849c46f84eea9aa1ef2bef6836e0ceec6451499bb6abf7e747d63f3996d0a5f7fc2d439c5ae0380e0e71f7c2823adfdda80e87a0bc377be1
+ENV JOOMLA_VERSION 5.1.0-alpha3
+ENV JOOMLA_SHA512 5d89702ba41741e635e5ac6065d8018b025a7910065b84ecc81a937530580c59430461c853b596c32f1fe45fe5ce4f9ca81669d6eb8d20df3e355f39bc486af4
# Download package and extract to web volume
RUN set -ex; \
- curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.4/Joomla_4.3.4-Stable-Full_Package.tar.bz2; \
- echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
+ curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0-alpha3/Joomla_5.1.0-alpha3-Alpha-Full_Package.tar.zst; \
+ echo "$JOOMLA_SHA512 *joomla.tar.zst" | sha512sum -c -; \
mkdir /usr/src/joomla; \
- tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
- rm joomla.tar.bz2; \
+ tar --zstd -xf joomla.tar.zst -C /usr/src/joomla; \
+ rm joomla.tar.zst; \
chown -R www-data:www-data /usr/src/joomla
# Copy init scripts
diff --git a/joomla_4.3-php8.2-apache/docker-entrypoint.sh b/joomla_5.1.0-alpha-php8.2-apache/docker-entrypoint.sh
similarity index 100%
rename from joomla_4.3-php8.2-apache/docker-entrypoint.sh
rename to joomla_5.1.0-alpha-php8.2-apache/docker-entrypoint.sh
diff --git a/joomla_4.3-php8.2-apache/makedb.php b/joomla_5.1.0-alpha-php8.2-apache/makedb.php
similarity index 100%
rename from joomla_4.3-php8.2-apache/makedb.php
rename to joomla_5.1.0-alpha-php8.2-apache/makedb.php
diff --git a/joomla_4.3-php8.2-fpm-alpine/Dockerfile b/joomla_5.1.0-alpha-php8.2-fpm-alpine/Dockerfile
similarity index 88%
rename from joomla_4.3-php8.2-fpm-alpine/Dockerfile
rename to joomla_5.1.0-alpha-php8.2-fpm-alpine/Dockerfile
index e66cf87..7cd3219 100644
--- a/joomla_4.3-php8.2-fpm-alpine/Dockerfile
+++ b/joomla_5.1.0-alpha-php8.2-fpm-alpine/Dockerfile
@@ -18,6 +18,8 @@ RUN set -eux; \
ghostscript \
# Alpine package for "imagemagick" contains ~120 .so files
imagemagick \
+# Needed for the zst joomla package
+ zstd \
;
# install the PHP extensions we need.
@@ -111,7 +113,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -130,16 +131,16 @@ RUN { \
VOLUME /var/www/html
# Define Joomla version and expected SHA512 signature
-ENV JOOMLA_VERSION 4.3.4
-ENV JOOMLA_SHA512 2efede3c3230d2fd849c46f84eea9aa1ef2bef6836e0ceec6451499bb6abf7e747d63f3996d0a5f7fc2d439c5ae0380e0e71f7c2823adfdda80e87a0bc377be1
+ENV JOOMLA_VERSION 5.1.0-alpha3
+ENV JOOMLA_SHA512 5d89702ba41741e635e5ac6065d8018b025a7910065b84ecc81a937530580c59430461c853b596c32f1fe45fe5ce4f9ca81669d6eb8d20df3e355f39bc486af4
# Download package and extract to web volume
RUN set -ex; \
- curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.4/Joomla_4.3.4-Stable-Full_Package.tar.bz2; \
- echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
+ curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0-alpha3/Joomla_5.1.0-alpha3-Alpha-Full_Package.tar.zst; \
+ echo "$JOOMLA_SHA512 *joomla.tar.zst" | sha512sum -c -; \
mkdir /usr/src/joomla; \
- tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
- rm joomla.tar.bz2; \
+ tar --zstd -xf joomla.tar.zst -C /usr/src/joomla; \
+ rm joomla.tar.zst; \
chown -R www-data:www-data /usr/src/joomla
# Copy init scripts
diff --git a/joomla_4.3-php8.2-fpm-alpine/docker-entrypoint.sh b/joomla_5.1.0-alpha-php8.2-fpm-alpine/docker-entrypoint.sh
similarity index 100%
rename from joomla_4.3-php8.2-fpm-alpine/docker-entrypoint.sh
rename to joomla_5.1.0-alpha-php8.2-fpm-alpine/docker-entrypoint.sh
diff --git a/joomla_4.3-php8.2-fpm-alpine/makedb.php b/joomla_5.1.0-alpha-php8.2-fpm-alpine/makedb.php
similarity index 100%
rename from joomla_4.3-php8.2-fpm-alpine/makedb.php
rename to joomla_5.1.0-alpha-php8.2-fpm-alpine/makedb.php
diff --git a/joomla_4.3-php8.2-fpm/Dockerfile b/joomla_5.1.0-alpha-php8.2-fpm/Dockerfile
similarity index 85%
rename from joomla_4.3-php8.2-fpm/Dockerfile
rename to joomla_5.1.0-alpha-php8.2-fpm/Dockerfile
index af8d6a5..dec65e7 100644
--- a/joomla_4.3-php8.2-fpm/Dockerfile
+++ b/joomla_5.1.0-alpha-php8.2-fpm/Dockerfile
@@ -15,6 +15,8 @@ RUN set -eux; \
apt-get install -y --no-install-recommends \
# Ghostscript is required for rendering PDF previews
ghostscript \
+# Needed for the zst joomla package
+ zstd \
; \
rm -rf /var/lib/apt/lists/*
@@ -89,9 +91,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -113,7 +115,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -132,16 +133,16 @@ RUN { \
VOLUME /var/www/html
# Define Joomla version and expected SHA512 signature
-ENV JOOMLA_VERSION 4.3.4
-ENV JOOMLA_SHA512 2efede3c3230d2fd849c46f84eea9aa1ef2bef6836e0ceec6451499bb6abf7e747d63f3996d0a5f7fc2d439c5ae0380e0e71f7c2823adfdda80e87a0bc377be1
+ENV JOOMLA_VERSION 5.1.0-alpha3
+ENV JOOMLA_SHA512 5d89702ba41741e635e5ac6065d8018b025a7910065b84ecc81a937530580c59430461c853b596c32f1fe45fe5ce4f9ca81669d6eb8d20df3e355f39bc486af4
# Download package and extract to web volume
RUN set -ex; \
- curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.4/Joomla_4.3.4-Stable-Full_Package.tar.bz2; \
- echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
+ curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0-alpha3/Joomla_5.1.0-alpha3-Alpha-Full_Package.tar.zst; \
+ echo "$JOOMLA_SHA512 *joomla.tar.zst" | sha512sum -c -; \
mkdir /usr/src/joomla; \
- tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
- rm joomla.tar.bz2; \
+ tar --zstd -xf joomla.tar.zst -C /usr/src/joomla; \
+ rm joomla.tar.zst; \
chown -R www-data:www-data /usr/src/joomla
# Copy init scripts
diff --git a/joomla_4.3-php8.2-fpm/docker-entrypoint.sh b/joomla_5.1.0-alpha-php8.2-fpm/docker-entrypoint.sh
similarity index 100%
rename from joomla_4.3-php8.2-fpm/docker-entrypoint.sh
rename to joomla_5.1.0-alpha-php8.2-fpm/docker-entrypoint.sh
diff --git a/joomla_4.3-php8.2-fpm/makedb.php b/joomla_5.1.0-alpha-php8.2-fpm/makedb.php
similarity index 100%
rename from joomla_4.3-php8.2-fpm/makedb.php
rename to joomla_5.1.0-alpha-php8.2-fpm/makedb.php
diff --git a/joomla_5-php8.1-apache/Dockerfile b/joomla_5.1.0-alpha-php8.3-apache/Dockerfile
similarity index 87%
copy from joomla_5-php8.1-apache/Dockerfile
copy to joomla_5.1.0-alpha-php8.3-apache/Dockerfile
index c3df4d3..59f297a 100644
--- a/joomla_5-php8.1-apache/Dockerfile
+++ b/joomla_5.1.0-alpha-php8.3-apache/Dockerfile
@@ -5,7 +5,7 @@
#
# from https://downloads.joomla.org/technical-requirements
-FROM php:8.1-apache
+FROM php:8.3-apache
LABEL maintainer="Llewellyn van der Merwe <[email protected]> (@Llewellynvdm), Harald Leithner <[email protected]> (@HLeithner)"
# Disable remote database security requirements.
@@ -91,9 +91,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -115,7 +115,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -139,11 +138,11 @@ RUN set -eux; \
{ \
echo 'RemoteIPHeader X-Forwarded-For'; \
# these IP ranges are reserved for "private" use and should thus *usually* be safe inside Docker
- echo 'RemoteIPTrustedProxy 10.0.0.0/8'; \
- echo 'RemoteIPTrustedProxy 172.16.0.0/12'; \
- echo 'RemoteIPTrustedProxy 192.168.0.0/16'; \
- echo 'RemoteIPTrustedProxy 169.254.0.0/16'; \
- echo 'RemoteIPTrustedProxy 127.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
+ echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
+ echo 'RemoteIPInternalProxy 169.254.0.0/16'; \
+ echo 'RemoteIPInternalProxy 127.0.0.0/8'; \
} > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip; \
# (replace all instances of "%h" with "%a" in LogFormat)
@@ -152,12 +151,12 @@ RUN set -eux; \
VOLUME /var/www/html
# Define Joomla version and expected SHA512 signature
-ENV JOOMLA_VERSION 5.0.2
-ENV JOOMLA_SHA512 e7bc9ecab410217fdf91a87f9461ff18dab311af56c61156fb7cf076b2fdf270b003ffddf131386ef35c94cb9f4ada39f8a69712c07664147108268ab5cc85a3
+ENV JOOMLA_VERSION 5.1.0-alpha3
+ENV JOOMLA_SHA512 5d89702ba41741e635e5ac6065d8018b025a7910065b84ecc81a937530580c59430461c853b596c32f1fe45fe5ce4f9ca81669d6eb8d20df3e355f39bc486af4
# Download package and extract to web volume
RUN set -ex; \
- curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.0.2/Joomla_5.0.2-Stable-Full_Package.tar.zst; \
+ curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0-alpha3/Joomla_5.1.0-alpha3-Alpha-Full_Package.tar.zst; \
echo "$JOOMLA_SHA512 *joomla.tar.zst" | sha512sum -c -; \
mkdir /usr/src/joomla; \
tar --zstd -xf joomla.tar.zst -C /usr/src/joomla; \
diff --git a/joomla_4.3-php8.1-apache/docker-entrypoint.sh b/joomla_5.1.0-alpha-php8.3-apache/docker-entrypoint.sh
similarity index 100%
copy from joomla_4.3-php8.1-apache/docker-entrypoint.sh
copy to joomla_5.1.0-alpha-php8.3-apache/docker-entrypoint.sh
diff --git a/joomla_4.3-php8.1-apache/makedb.php b/joomla_5.1.0-alpha-php8.3-apache/makedb.php
similarity index 100%
copy from joomla_4.3-php8.1-apache/makedb.php
copy to joomla_5.1.0-alpha-php8.3-apache/makedb.php
diff --git a/joomla_5-php8.1-fpm-alpine/Dockerfile b/joomla_5.1.0-alpha-php8.3-fpm-alpine/Dockerfile
similarity index 93%
copy from joomla_5-php8.1-fpm-alpine/Dockerfile
copy to joomla_5.1.0-alpha-php8.3-fpm-alpine/Dockerfile
index 7d98677..f60f6f3 100644
--- a/joomla_5-php8.1-fpm-alpine/Dockerfile
+++ b/joomla_5.1.0-alpha-php8.3-fpm-alpine/Dockerfile
@@ -5,7 +5,7 @@
#
# from https://downloads.joomla.org/technical-requirements
-FROM php:8.1-fpm-alpine
+FROM php:8.3-fpm-alpine
LABEL maintainer="Llewellyn van der Merwe <[email protected]> (@Llewellynvdm), Harald Leithner <[email protected]> (@HLeithner)"
# Disable remote database security requirements.
@@ -113,7 +113,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -132,12 +131,12 @@ RUN { \
VOLUME /var/www/html
# Define Joomla version and expected SHA512 signature
-ENV JOOMLA_VERSION 5.0.2
-ENV JOOMLA_SHA512 e7bc9ecab410217fdf91a87f9461ff18dab311af56c61156fb7cf076b2fdf270b003ffddf131386ef35c94cb9f4ada39f8a69712c07664147108268ab5cc85a3
+ENV JOOMLA_VERSION 5.1.0-alpha3
+ENV JOOMLA_SHA512 5d89702ba41741e635e5ac6065d8018b025a7910065b84ecc81a937530580c59430461c853b596c32f1fe45fe5ce4f9ca81669d6eb8d20df3e355f39bc486af4
# Download package and extract to web volume
RUN set -ex; \
- curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.0.2/Joomla_5.0.2-Stable-Full_Package.tar.zst; \
+ curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0-alpha3/Joomla_5.1.0-alpha3-Alpha-Full_Package.tar.zst; \
echo "$JOOMLA_SHA512 *joomla.tar.zst" | sha512sum -c -; \
mkdir /usr/src/joomla; \
tar --zstd -xf joomla.tar.zst -C /usr/src/joomla; \
diff --git a/joomla_4.3-php8.1-apache/docker-entrypoint.sh b/joomla_5.1.0-alpha-php8.3-fpm-alpine/docker-entrypoint.sh
similarity index 100%
copy from joomla_4.3-php8.1-apache/docker-entrypoint.sh
copy to joomla_5.1.0-alpha-php8.3-fpm-alpine/docker-entrypoint.sh
diff --git a/joomla_4.3-php8.1-apache/makedb.php b/joomla_5.1.0-alpha-php8.3-fpm-alpine/makedb.php
similarity index 100%
copy from joomla_4.3-php8.1-apache/makedb.php
copy to joomla_5.1.0-alpha-php8.3-fpm-alpine/makedb.php
diff --git a/joomla_5-php8.2-fpm/Dockerfile b/joomla_5.1.0-alpha-php8.3-fpm/Dockerfile
similarity index 90%
copy from joomla_5-php8.2-fpm/Dockerfile
copy to joomla_5.1.0-alpha-php8.3-fpm/Dockerfile
index 935aeee..880bb4f 100644
--- a/joomla_5-php8.2-fpm/Dockerfile
+++ b/joomla_5.1.0-alpha-php8.3-fpm/Dockerfile
@@ -5,7 +5,7 @@
#
# from https://downloads.joomla.org/technical-requirements
-FROM php:8.2-fpm
+FROM php:8.3-fpm
LABEL maintainer="Llewellyn van der Merwe <[email protected]> (@Llewellynvdm), Harald Leithner <[email protected]> (@HLeithner)"
# Disable remote database security requirements.
@@ -91,9 +91,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -115,7 +115,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -134,12 +133,12 @@ RUN { \
VOLUME /var/www/html
# Define Joomla version and expected SHA512 signature
-ENV JOOMLA_VERSION 5.0.2
-ENV JOOMLA_SHA512 e7bc9ecab410217fdf91a87f9461ff18dab311af56c61156fb7cf076b2fdf270b003ffddf131386ef35c94cb9f4ada39f8a69712c07664147108268ab5cc85a3
+ENV JOOMLA_VERSION 5.1.0-alpha3
+ENV JOOMLA_SHA512 5d89702ba41741e635e5ac6065d8018b025a7910065b84ecc81a937530580c59430461c853b596c32f1fe45fe5ce4f9ca81669d6eb8d20df3e355f39bc486af4
# Download package and extract to web volume
RUN set -ex; \
- curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.0.2/Joomla_5.0.2-Stable-Full_Package.tar.zst; \
+ curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0-alpha3/Joomla_5.1.0-alpha3-Alpha-Full_Package.tar.zst; \
echo "$JOOMLA_SHA512 *joomla.tar.zst" | sha512sum -c -; \
mkdir /usr/src/joomla; \
tar --zstd -xf joomla.tar.zst -C /usr/src/joomla; \
diff --git a/joomla_4.3-php8.1-apache/docker-entrypoint.sh b/joomla_5.1.0-alpha-php8.3-fpm/docker-entrypoint.sh
similarity index 100%
rename from joomla_4.3-php8.1-apache/docker-entrypoint.sh
rename to joomla_5.1.0-alpha-php8.3-fpm/docker-entrypoint.sh
diff --git a/joomla_4.3-php8.1-apache/makedb.php b/joomla_5.1.0-alpha-php8.3-fpm/makedb.php
similarity index 100%
rename from joomla_4.3-php8.1-apache/makedb.php
rename to joomla_5.1.0-alpha-php8.3-fpm/makedb.php
diff --git a/joomla_php8.1-apache/Dockerfile b/joomla_php8.1-apache/Dockerfile
index 17c06b0..291f440 100644
--- a/joomla_php8.1-apache/Dockerfile
+++ b/joomla_php8.1-apache/Dockerfile
@@ -89,9 +89,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -113,7 +113,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -137,11 +136,11 @@ RUN set -eux; \
{ \
echo 'RemoteIPHeader X-Forwarded-For'; \
# these IP ranges are reserved for "private" use and should thus *usually* be safe inside Docker
- echo 'RemoteIPTrustedProxy 10.0.0.0/8'; \
- echo 'RemoteIPTrustedProxy 172.16.0.0/12'; \
- echo 'RemoteIPTrustedProxy 192.168.0.0/16'; \
- echo 'RemoteIPTrustedProxy 169.254.0.0/16'; \
- echo 'RemoteIPTrustedProxy 127.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
+ echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
+ echo 'RemoteIPInternalProxy 169.254.0.0/16'; \
+ echo 'RemoteIPInternalProxy 127.0.0.0/8'; \
} > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip; \
# (replace all instances of "%h" with "%a" in LogFormat)
diff --git a/joomla_php8.1-fpm-alpine/Dockerfile b/joomla_php8.1-fpm-alpine/Dockerfile
index 21d7b1f..8a7d684 100644
--- a/joomla_php8.1-fpm-alpine/Dockerfile
+++ b/joomla_php8.1-fpm-alpine/Dockerfile
@@ -111,7 +111,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
diff --git a/joomla_php8.1-fpm/Dockerfile b/joomla_php8.1-fpm/Dockerfile
index 676f40b..bd89733 100644
--- a/joomla_php8.1-fpm/Dockerfile
+++ b/joomla_php8.1-fpm/Dockerfile
@@ -89,9 +89,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -113,7 +113,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
diff --git a/joomla_php8.2-apache/Dockerfile b/joomla_php8.2-apache/Dockerfile
index 266ba39..aa44fb9 100644
--- a/joomla_php8.2-apache/Dockerfile
+++ b/joomla_php8.2-apache/Dockerfile
@@ -89,9 +89,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -113,7 +113,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
@@ -137,11 +136,11 @@ RUN set -eux; \
{ \
echo 'RemoteIPHeader X-Forwarded-For'; \
# these IP ranges are reserved for "private" use and should thus *usually* be safe inside Docker
- echo 'RemoteIPTrustedProxy 10.0.0.0/8'; \
- echo 'RemoteIPTrustedProxy 172.16.0.0/12'; \
- echo 'RemoteIPTrustedProxy 192.168.0.0/16'; \
- echo 'RemoteIPTrustedProxy 169.254.0.0/16'; \
- echo 'RemoteIPTrustedProxy 127.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
+ echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
+ echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
+ echo 'RemoteIPInternalProxy 169.254.0.0/16'; \
+ echo 'RemoteIPInternalProxy 127.0.0.0/8'; \
} > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip; \
# (replace all instances of "%h" with "%a" in LogFormat)
diff --git a/joomla_php8.2-fpm-alpine/Dockerfile b/joomla_php8.2-fpm-alpine/Dockerfile
index 194502c..fa69b3d 100644
--- a/joomla_php8.2-fpm-alpine/Dockerfile
+++ b/joomla_php8.2-fpm-alpine/Dockerfile
@@ -111,7 +111,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \
diff --git a/joomla_php8.2-fpm/Dockerfile b/joomla_php8.2-fpm/Dockerfile
index 6f835d9..a2cb835 100644
--- a/joomla_php8.2-fpm/Dockerfile
+++ b/joomla_php8.2-fpm/Dockerfile
@@ -89,9 +89,9 @@ RUN set -ex; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$extDir"/*.so \
- | awk '/=>/ { print $3 }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | xargs -r dpkg-query -S \
+ | xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
@@ -113,7 +113,6 @@ RUN set -eux; \
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
# set recommended error logging
RUN { \Relevant Maintainers:
|
tianon
approved these changes
Jan 26, 2024
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.
Changes: