From efba6bb87ef113bfa2a9d60b52095f942fce3671 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Tue, 2 May 2023 19:39:23 +0200 Subject: [PATCH] Remove the 4.2 build. Update version of Joomla! 4.2.9 to 4.3.1 --- {4.2 => 4.3}/php8.0/apache/Dockerfile | 6 +++--- {4.2 => 4.3}/php8.0/apache/docker-entrypoint.sh | 0 {4.2 => 4.3}/php8.0/apache/makedb.php | 0 {4.2 => 4.3}/php8.0/fpm-alpine/Dockerfile | 6 +++--- {4.2 => 4.3}/php8.0/fpm-alpine/docker-entrypoint.sh | 0 {4.2 => 4.3}/php8.0/fpm-alpine/makedb.php | 0 {4.2 => 4.3}/php8.0/fpm/Dockerfile | 6 +++--- {4.2 => 4.3}/php8.0/fpm/docker-entrypoint.sh | 0 {4.2 => 4.3}/php8.0/fpm/makedb.php | 0 {4.2 => 4.3}/php8.1/apache/Dockerfile | 6 +++--- {4.2 => 4.3}/php8.1/apache/docker-entrypoint.sh | 0 {4.2 => 4.3}/php8.1/apache/makedb.php | 0 {4.2 => 4.3}/php8.1/fpm-alpine/Dockerfile | 6 +++--- {4.2 => 4.3}/php8.1/fpm-alpine/docker-entrypoint.sh | 0 {4.2 => 4.3}/php8.1/fpm-alpine/makedb.php | 0 {4.2 => 4.3}/php8.1/fpm/Dockerfile | 6 +++--- {4.2 => 4.3}/php8.1/fpm/docker-entrypoint.sh | 0 {4.2 => 4.3}/php8.1/fpm/makedb.php | 0 versions-helper.json | 4 ++-- versions.json | 8 ++++---- 20 files changed, 24 insertions(+), 24 deletions(-) rename {4.2 => 4.3}/php8.0/apache/Dockerfile (95%) rename {4.2 => 4.3}/php8.0/apache/docker-entrypoint.sh (100%) rename {4.2 => 4.3}/php8.0/apache/makedb.php (100%) rename {4.2 => 4.3}/php8.0/fpm-alpine/Dockerfile (94%) rename {4.2 => 4.3}/php8.0/fpm-alpine/docker-entrypoint.sh (100%) rename {4.2 => 4.3}/php8.0/fpm-alpine/makedb.php (100%) rename {4.2 => 4.3}/php8.0/fpm/Dockerfile (94%) rename {4.2 => 4.3}/php8.0/fpm/docker-entrypoint.sh (100%) rename {4.2 => 4.3}/php8.0/fpm/makedb.php (100%) rename {4.2 => 4.3}/php8.1/apache/Dockerfile (95%) rename {4.2 => 4.3}/php8.1/apache/docker-entrypoint.sh (100%) rename {4.2 => 4.3}/php8.1/apache/makedb.php (100%) rename {4.2 => 4.3}/php8.1/fpm-alpine/Dockerfile (94%) rename {4.2 => 4.3}/php8.1/fpm-alpine/docker-entrypoint.sh (100%) rename {4.2 => 4.3}/php8.1/fpm-alpine/makedb.php (100%) rename {4.2 => 4.3}/php8.1/fpm/Dockerfile (94%) rename {4.2 => 4.3}/php8.1/fpm/docker-entrypoint.sh (100%) rename {4.2 => 4.3}/php8.1/fpm/makedb.php (100%) diff --git a/4.2/php8.0/apache/Dockerfile b/4.3/php8.0/apache/Dockerfile similarity index 95% rename from 4.2/php8.0/apache/Dockerfile rename to 4.3/php8.0/apache/Dockerfile index 3bf0b1a..df22719 100644 --- a/4.2/php8.0/apache/Dockerfile +++ b/4.3/php8.0/apache/Dockerfile @@ -150,12 +150,12 @@ RUN set -eux; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.2.9 -ENV JOOMLA_SHA512 25805241234753c05f562cf3be599c63cfcfb2e7dcf6b5b76b1cb4b6a4d305497c720eaccdc0939e4fceffa83099db9b3c44963fce86bafc3efc2fc34fecaa20 +ENV JOOMLA_VERSION 4.3.1 +ENV JOOMLA_SHA512 0d761f1cbf6ca75072ecc9cba65a04be216d318bd1bd685fe258fc44d74442e5b6dfa3d1b2cd2d4150722da5935cb0206faf5b2dd9a25629e933938f2dc0d00f # 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.2.9/Joomla_4.2.9-Stable-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.1/Joomla_4.3.1-Stable-Full_Package.tar.bz2; \ echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \ mkdir /usr/src/joomla; \ tar -xf joomla.tar.bz2 -C /usr/src/joomla; \ diff --git a/4.2/php8.0/apache/docker-entrypoint.sh b/4.3/php8.0/apache/docker-entrypoint.sh similarity index 100% rename from 4.2/php8.0/apache/docker-entrypoint.sh rename to 4.3/php8.0/apache/docker-entrypoint.sh diff --git a/4.2/php8.0/apache/makedb.php b/4.3/php8.0/apache/makedb.php similarity index 100% rename from 4.2/php8.0/apache/makedb.php rename to 4.3/php8.0/apache/makedb.php diff --git a/4.2/php8.0/fpm-alpine/Dockerfile b/4.3/php8.0/fpm-alpine/Dockerfile similarity index 94% rename from 4.2/php8.0/fpm-alpine/Dockerfile rename to 4.3/php8.0/fpm-alpine/Dockerfile index d0242b3..3e428e0 100644 --- a/4.2/php8.0/fpm-alpine/Dockerfile +++ b/4.3/php8.0/fpm-alpine/Dockerfile @@ -130,12 +130,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.2.9 -ENV JOOMLA_SHA512 25805241234753c05f562cf3be599c63cfcfb2e7dcf6b5b76b1cb4b6a4d305497c720eaccdc0939e4fceffa83099db9b3c44963fce86bafc3efc2fc34fecaa20 +ENV JOOMLA_VERSION 4.3.1 +ENV JOOMLA_SHA512 0d761f1cbf6ca75072ecc9cba65a04be216d318bd1bd685fe258fc44d74442e5b6dfa3d1b2cd2d4150722da5935cb0206faf5b2dd9a25629e933938f2dc0d00f # 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.2.9/Joomla_4.2.9-Stable-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.1/Joomla_4.3.1-Stable-Full_Package.tar.bz2; \ echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \ mkdir /usr/src/joomla; \ tar -xf joomla.tar.bz2 -C /usr/src/joomla; \ diff --git a/4.2/php8.0/fpm-alpine/docker-entrypoint.sh b/4.3/php8.0/fpm-alpine/docker-entrypoint.sh similarity index 100% rename from 4.2/php8.0/fpm-alpine/docker-entrypoint.sh rename to 4.3/php8.0/fpm-alpine/docker-entrypoint.sh diff --git a/4.2/php8.0/fpm-alpine/makedb.php b/4.3/php8.0/fpm-alpine/makedb.php similarity index 100% rename from 4.2/php8.0/fpm-alpine/makedb.php rename to 4.3/php8.0/fpm-alpine/makedb.php diff --git a/4.2/php8.0/fpm/Dockerfile b/4.3/php8.0/fpm/Dockerfile similarity index 94% rename from 4.2/php8.0/fpm/Dockerfile rename to 4.3/php8.0/fpm/Dockerfile index 94db993..d86a885 100644 --- a/4.2/php8.0/fpm/Dockerfile +++ b/4.3/php8.0/fpm/Dockerfile @@ -132,12 +132,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.2.9 -ENV JOOMLA_SHA512 25805241234753c05f562cf3be599c63cfcfb2e7dcf6b5b76b1cb4b6a4d305497c720eaccdc0939e4fceffa83099db9b3c44963fce86bafc3efc2fc34fecaa20 +ENV JOOMLA_VERSION 4.3.1 +ENV JOOMLA_SHA512 0d761f1cbf6ca75072ecc9cba65a04be216d318bd1bd685fe258fc44d74442e5b6dfa3d1b2cd2d4150722da5935cb0206faf5b2dd9a25629e933938f2dc0d00f # 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.2.9/Joomla_4.2.9-Stable-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.1/Joomla_4.3.1-Stable-Full_Package.tar.bz2; \ echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \ mkdir /usr/src/joomla; \ tar -xf joomla.tar.bz2 -C /usr/src/joomla; \ diff --git a/4.2/php8.0/fpm/docker-entrypoint.sh b/4.3/php8.0/fpm/docker-entrypoint.sh similarity index 100% rename from 4.2/php8.0/fpm/docker-entrypoint.sh rename to 4.3/php8.0/fpm/docker-entrypoint.sh diff --git a/4.2/php8.0/fpm/makedb.php b/4.3/php8.0/fpm/makedb.php similarity index 100% rename from 4.2/php8.0/fpm/makedb.php rename to 4.3/php8.0/fpm/makedb.php diff --git a/4.2/php8.1/apache/Dockerfile b/4.3/php8.1/apache/Dockerfile similarity index 95% rename from 4.2/php8.1/apache/Dockerfile rename to 4.3/php8.1/apache/Dockerfile index ee38200..ae1684f 100644 --- a/4.2/php8.1/apache/Dockerfile +++ b/4.3/php8.1/apache/Dockerfile @@ -150,12 +150,12 @@ RUN set -eux; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.2.9 -ENV JOOMLA_SHA512 25805241234753c05f562cf3be599c63cfcfb2e7dcf6b5b76b1cb4b6a4d305497c720eaccdc0939e4fceffa83099db9b3c44963fce86bafc3efc2fc34fecaa20 +ENV JOOMLA_VERSION 4.3.1 +ENV JOOMLA_SHA512 0d761f1cbf6ca75072ecc9cba65a04be216d318bd1bd685fe258fc44d74442e5b6dfa3d1b2cd2d4150722da5935cb0206faf5b2dd9a25629e933938f2dc0d00f # 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.2.9/Joomla_4.2.9-Stable-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.1/Joomla_4.3.1-Stable-Full_Package.tar.bz2; \ echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \ mkdir /usr/src/joomla; \ tar -xf joomla.tar.bz2 -C /usr/src/joomla; \ diff --git a/4.2/php8.1/apache/docker-entrypoint.sh b/4.3/php8.1/apache/docker-entrypoint.sh similarity index 100% rename from 4.2/php8.1/apache/docker-entrypoint.sh rename to 4.3/php8.1/apache/docker-entrypoint.sh diff --git a/4.2/php8.1/apache/makedb.php b/4.3/php8.1/apache/makedb.php similarity index 100% rename from 4.2/php8.1/apache/makedb.php rename to 4.3/php8.1/apache/makedb.php diff --git a/4.2/php8.1/fpm-alpine/Dockerfile b/4.3/php8.1/fpm-alpine/Dockerfile similarity index 94% rename from 4.2/php8.1/fpm-alpine/Dockerfile rename to 4.3/php8.1/fpm-alpine/Dockerfile index 3d80228..722ca34 100644 --- a/4.2/php8.1/fpm-alpine/Dockerfile +++ b/4.3/php8.1/fpm-alpine/Dockerfile @@ -130,12 +130,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.2.9 -ENV JOOMLA_SHA512 25805241234753c05f562cf3be599c63cfcfb2e7dcf6b5b76b1cb4b6a4d305497c720eaccdc0939e4fceffa83099db9b3c44963fce86bafc3efc2fc34fecaa20 +ENV JOOMLA_VERSION 4.3.1 +ENV JOOMLA_SHA512 0d761f1cbf6ca75072ecc9cba65a04be216d318bd1bd685fe258fc44d74442e5b6dfa3d1b2cd2d4150722da5935cb0206faf5b2dd9a25629e933938f2dc0d00f # 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.2.9/Joomla_4.2.9-Stable-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.1/Joomla_4.3.1-Stable-Full_Package.tar.bz2; \ echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \ mkdir /usr/src/joomla; \ tar -xf joomla.tar.bz2 -C /usr/src/joomla; \ diff --git a/4.2/php8.1/fpm-alpine/docker-entrypoint.sh b/4.3/php8.1/fpm-alpine/docker-entrypoint.sh similarity index 100% rename from 4.2/php8.1/fpm-alpine/docker-entrypoint.sh rename to 4.3/php8.1/fpm-alpine/docker-entrypoint.sh diff --git a/4.2/php8.1/fpm-alpine/makedb.php b/4.3/php8.1/fpm-alpine/makedb.php similarity index 100% rename from 4.2/php8.1/fpm-alpine/makedb.php rename to 4.3/php8.1/fpm-alpine/makedb.php diff --git a/4.2/php8.1/fpm/Dockerfile b/4.3/php8.1/fpm/Dockerfile similarity index 94% rename from 4.2/php8.1/fpm/Dockerfile rename to 4.3/php8.1/fpm/Dockerfile index 0cdb968..c995c1c 100644 --- a/4.2/php8.1/fpm/Dockerfile +++ b/4.3/php8.1/fpm/Dockerfile @@ -132,12 +132,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.2.9 -ENV JOOMLA_SHA512 25805241234753c05f562cf3be599c63cfcfb2e7dcf6b5b76b1cb4b6a4d305497c720eaccdc0939e4fceffa83099db9b3c44963fce86bafc3efc2fc34fecaa20 +ENV JOOMLA_VERSION 4.3.1 +ENV JOOMLA_SHA512 0d761f1cbf6ca75072ecc9cba65a04be216d318bd1bd685fe258fc44d74442e5b6dfa3d1b2cd2d4150722da5935cb0206faf5b2dd9a25629e933938f2dc0d00f # 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.2.9/Joomla_4.2.9-Stable-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.1/Joomla_4.3.1-Stable-Full_Package.tar.bz2; \ echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \ mkdir /usr/src/joomla; \ tar -xf joomla.tar.bz2 -C /usr/src/joomla; \ diff --git a/4.2/php8.1/fpm/docker-entrypoint.sh b/4.3/php8.1/fpm/docker-entrypoint.sh similarity index 100% rename from 4.2/php8.1/fpm/docker-entrypoint.sh rename to 4.3/php8.1/fpm/docker-entrypoint.sh diff --git a/4.2/php8.1/fpm/makedb.php b/4.3/php8.1/fpm/makedb.php similarity index 100% rename from 4.2/php8.1/fpm/makedb.php rename to 4.3/php8.1/fpm/makedb.php diff --git a/versions-helper.json b/versions-helper.json index 7c5a27b..5bdc66b 100644 --- a/versions-helper.json +++ b/versions-helper.json @@ -1,6 +1,6 @@ { - "4.2": { - "version": "4.2.9", + "4.3": { + "version": "4.3.1", "php": "8.0", "aliases": [4, "latest"], "phpVersions": { diff --git a/versions.json b/versions.json index 99dff9d..d46a87c 100644 --- a/versions.json +++ b/versions.json @@ -17,24 +17,24 @@ ], "version": "3.10.11" }, - "4.2": { + "4.3": { "aliases": [ 4, "latest" ], - "package": "https://github.com/joomla/joomla-cms/releases/download/4.2.9/Joomla_4.2.9-Stable-Full_Package.tar.bz2", + "package": "https://github.com/joomla/joomla-cms/releases/download/4.3.1/Joomla_4.3.1-Stable-Full_Package.tar.bz2", "php": "8.0", "phpVersions": [ "8.0", "8.1" ], - "sha512": "25805241234753c05f562cf3be599c63cfcfb2e7dcf6b5b76b1cb4b6a4d305497c720eaccdc0939e4fceffa83099db9b3c44963fce86bafc3efc2fc34fecaa20", + "sha512": "0d761f1cbf6ca75072ecc9cba65a04be216d318bd1bd685fe258fc44d74442e5b6dfa3d1b2cd2d4150722da5935cb0206faf5b2dd9a25629e933938f2dc0d00f", "variant": "apache", "variants": [ "apache", "fpm-alpine", "fpm" ], - "version": "4.2.9" + "version": "4.3.1" } }