From 8cac4ff7ae88b9274870a95f5e22ea3c32f01fd7 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Wed, 18 Oct 2023 11:56:58 +0200 Subject: [PATCH] Adds Joomla 5.0.0 and 4.4.0 Removes Joomla 5.0.beta and 4.4.beta. --- {4.4.rc => 4.4}/php8.0/apache/Dockerfile | 6 ++--- .../php8.0/apache/docker-entrypoint.sh | 0 {4.4.rc => 4.4}/php8.0/apache/makedb.php | 0 {4.4.rc => 4.4}/php8.0/fpm-alpine/Dockerfile | 6 ++--- .../php8.0/fpm-alpine/docker-entrypoint.sh | 0 {4.4.rc => 4.4}/php8.0/fpm-alpine/makedb.php | 0 {4.4.rc => 4.4}/php8.0/fpm/Dockerfile | 6 ++--- .../php8.0/fpm/docker-entrypoint.sh | 0 {4.4.rc => 4.4}/php8.0/fpm/makedb.php | 0 {5.0.rc => 4.4}/php8.1/apache/Dockerfile | 6 ++--- .../php8.1/apache/docker-entrypoint.sh | 0 {4.4.rc => 4.4}/php8.1/apache/makedb.php | 0 {5.0.rc => 4.4}/php8.1/fpm-alpine/Dockerfile | 6 ++--- .../php8.1/fpm-alpine/docker-entrypoint.sh | 0 {4.4.rc => 4.4}/php8.1/fpm-alpine/makedb.php | 0 {5.0.rc => 4.4}/php8.1/fpm/Dockerfile | 6 ++--- .../php8.1/fpm/docker-entrypoint.sh | 0 {4.4.rc => 4.4}/php8.1/fpm/makedb.php | 0 {5.0.rc => 4.4}/php8.2/apache/Dockerfile | 6 ++--- .../php8.2/apache/docker-entrypoint.sh | 0 {4.4.rc => 4.4}/php8.2/apache/makedb.php | 0 {5.0.rc => 4.4}/php8.2/fpm-alpine/Dockerfile | 6 ++--- .../php8.2/fpm-alpine/docker-entrypoint.sh | 0 {4.4.rc => 4.4}/php8.2/fpm-alpine/makedb.php | 0 {5.0.rc => 4.4}/php8.2/fpm/Dockerfile | 6 ++--- .../php8.2/fpm/docker-entrypoint.sh | 0 {4.4.rc => 4.4}/php8.2/fpm/makedb.php | 0 {4.4.rc => 5.0}/php8.1/apache/Dockerfile | 14 +++++----- .../php8.1/apache/docker-entrypoint.sh | 0 {5.0.rc => 5.0}/php8.1/apache/makedb.php | 0 {4.4.rc => 5.0}/php8.1/fpm-alpine/Dockerfile | 14 +++++----- .../php8.1/fpm-alpine/docker-entrypoint.sh | 0 {5.0.rc => 5.0}/php8.1/fpm-alpine/makedb.php | 0 {4.4.rc => 5.0}/php8.1/fpm/Dockerfile | 14 +++++----- .../php8.1/fpm/docker-entrypoint.sh | 0 {5.0.rc => 5.0}/php8.1/fpm/makedb.php | 0 {4.4.rc => 5.0}/php8.2/apache/Dockerfile | 14 +++++----- .../php8.2/apache/docker-entrypoint.sh | 0 {5.0.rc => 5.0}/php8.2/apache/makedb.php | 0 {4.4.rc => 5.0}/php8.2/fpm-alpine/Dockerfile | 14 +++++----- .../php8.2/fpm-alpine/docker-entrypoint.sh | 0 {5.0.rc => 5.0}/php8.2/fpm-alpine/makedb.php | 0 {4.4.rc => 5.0}/php8.2/fpm/Dockerfile | 14 +++++----- .../php8.2/fpm/docker-entrypoint.sh | 0 {5.0.rc => 5.0}/php8.2/fpm/makedb.php | 0 Dockerfile.template | 18 ++++++++++--- apply-templates.sh | 3 +++ versions-helper.json | 17 ++++++------ versions.json | 26 +++++++++++-------- versions.sh | 22 ++++++++++------ 50 files changed, 130 insertions(+), 94 deletions(-) rename {4.4.rc => 4.4}/php8.0/apache/Dockerfile (95%) rename {4.4.rc => 4.4}/php8.0/apache/docker-entrypoint.sh (100%) rename {4.4.rc => 4.4}/php8.0/apache/makedb.php (100%) rename {4.4.rc => 4.4}/php8.0/fpm-alpine/Dockerfile (94%) rename {4.4.rc => 4.4}/php8.0/fpm-alpine/docker-entrypoint.sh (100%) rename {4.4.rc => 4.4}/php8.0/fpm-alpine/makedb.php (100%) rename {4.4.rc => 4.4}/php8.0/fpm/Dockerfile (94%) rename {4.4.rc => 4.4}/php8.0/fpm/docker-entrypoint.sh (100%) rename {4.4.rc => 4.4}/php8.0/fpm/makedb.php (100%) rename {5.0.rc => 4.4}/php8.1/apache/Dockerfile (95%) rename {4.4.rc => 4.4}/php8.1/apache/docker-entrypoint.sh (100%) rename {4.4.rc => 4.4}/php8.1/apache/makedb.php (100%) rename {5.0.rc => 4.4}/php8.1/fpm-alpine/Dockerfile (94%) rename {4.4.rc => 4.4}/php8.1/fpm-alpine/docker-entrypoint.sh (100%) rename {4.4.rc => 4.4}/php8.1/fpm-alpine/makedb.php (100%) rename {5.0.rc => 4.4}/php8.1/fpm/Dockerfile (94%) rename {4.4.rc => 4.4}/php8.1/fpm/docker-entrypoint.sh (100%) rename {4.4.rc => 4.4}/php8.1/fpm/makedb.php (100%) rename {5.0.rc => 4.4}/php8.2/apache/Dockerfile (95%) rename {4.4.rc => 4.4}/php8.2/apache/docker-entrypoint.sh (100%) rename {4.4.rc => 4.4}/php8.2/apache/makedb.php (100%) rename {5.0.rc => 4.4}/php8.2/fpm-alpine/Dockerfile (94%) rename {4.4.rc => 4.4}/php8.2/fpm-alpine/docker-entrypoint.sh (100%) rename {4.4.rc => 4.4}/php8.2/fpm-alpine/makedb.php (100%) rename {5.0.rc => 4.4}/php8.2/fpm/Dockerfile (94%) rename {4.4.rc => 4.4}/php8.2/fpm/docker-entrypoint.sh (100%) rename {4.4.rc => 4.4}/php8.2/fpm/makedb.php (100%) rename {4.4.rc => 5.0}/php8.1/apache/Dockerfile (90%) rename {5.0.rc => 5.0}/php8.1/apache/docker-entrypoint.sh (100%) rename {5.0.rc => 5.0}/php8.1/apache/makedb.php (100%) rename {4.4.rc => 5.0}/php8.1/fpm-alpine/Dockerfile (89%) rename {5.0.rc => 5.0}/php8.1/fpm-alpine/docker-entrypoint.sh (100%) rename {5.0.rc => 5.0}/php8.1/fpm-alpine/makedb.php (100%) rename {4.4.rc => 5.0}/php8.1/fpm/Dockerfile (89%) rename {5.0.rc => 5.0}/php8.1/fpm/docker-entrypoint.sh (100%) rename {5.0.rc => 5.0}/php8.1/fpm/makedb.php (100%) rename {4.4.rc => 5.0}/php8.2/apache/Dockerfile (90%) rename {5.0.rc => 5.0}/php8.2/apache/docker-entrypoint.sh (100%) rename {5.0.rc => 5.0}/php8.2/apache/makedb.php (100%) rename {4.4.rc => 5.0}/php8.2/fpm-alpine/Dockerfile (89%) rename {5.0.rc => 5.0}/php8.2/fpm-alpine/docker-entrypoint.sh (100%) rename {5.0.rc => 5.0}/php8.2/fpm-alpine/makedb.php (100%) rename {4.4.rc => 5.0}/php8.2/fpm/Dockerfile (89%) rename {5.0.rc => 5.0}/php8.2/fpm/docker-entrypoint.sh (100%) rename {5.0.rc => 5.0}/php8.2/fpm/makedb.php (100%) diff --git a/4.4.rc/php8.0/apache/Dockerfile b/4.4/php8.0/apache/Dockerfile similarity index 95% rename from 4.4.rc/php8.0/apache/Dockerfile rename to 4.4/php8.0/apache/Dockerfile index 5d63d81..3103846 100644 --- a/4.4.rc/php8.0/apache/Dockerfile +++ b/4.4/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.4.0-rc1 -ENV JOOMLA_SHA512 f71fd1fd1ba32630b6fb26854b7bb7bc09a9985407cd6138d57e0f7c91afb6f92c3ac3169f13323f144ebe89e7eb1d85b1ad0aa950812f23347224fe2037bca1 +ENV JOOMLA_VERSION 4.4.0 +ENV JOOMLA_SHA512 800e985b1aa99e0df329349779f3c0f2f29a5c4de5115a7804b118029cba6f8d726cbd09979e3ac5a13e6a518ff87f847e713be9fa38ee59b04a5e9102479838 # 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.4.0-rc1/Joomla_4.4.0-rc1-Release_Candidate-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.0/Joomla_4.4.0-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.4.rc/php8.0/apache/docker-entrypoint.sh b/4.4/php8.0/apache/docker-entrypoint.sh similarity index 100% rename from 4.4.rc/php8.0/apache/docker-entrypoint.sh rename to 4.4/php8.0/apache/docker-entrypoint.sh diff --git a/4.4.rc/php8.0/apache/makedb.php b/4.4/php8.0/apache/makedb.php similarity index 100% rename from 4.4.rc/php8.0/apache/makedb.php rename to 4.4/php8.0/apache/makedb.php diff --git a/4.4.rc/php8.0/fpm-alpine/Dockerfile b/4.4/php8.0/fpm-alpine/Dockerfile similarity index 94% rename from 4.4.rc/php8.0/fpm-alpine/Dockerfile rename to 4.4/php8.0/fpm-alpine/Dockerfile index 83298a8..061f76c 100644 --- a/4.4.rc/php8.0/fpm-alpine/Dockerfile +++ b/4.4/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.4.0-rc1 -ENV JOOMLA_SHA512 f71fd1fd1ba32630b6fb26854b7bb7bc09a9985407cd6138d57e0f7c91afb6f92c3ac3169f13323f144ebe89e7eb1d85b1ad0aa950812f23347224fe2037bca1 +ENV JOOMLA_VERSION 4.4.0 +ENV JOOMLA_SHA512 800e985b1aa99e0df329349779f3c0f2f29a5c4de5115a7804b118029cba6f8d726cbd09979e3ac5a13e6a518ff87f847e713be9fa38ee59b04a5e9102479838 # 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.4.0-rc1/Joomla_4.4.0-rc1-Release_Candidate-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.0/Joomla_4.4.0-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.4.rc/php8.0/fpm-alpine/docker-entrypoint.sh b/4.4/php8.0/fpm-alpine/docker-entrypoint.sh similarity index 100% rename from 4.4.rc/php8.0/fpm-alpine/docker-entrypoint.sh rename to 4.4/php8.0/fpm-alpine/docker-entrypoint.sh diff --git a/4.4.rc/php8.0/fpm-alpine/makedb.php b/4.4/php8.0/fpm-alpine/makedb.php similarity index 100% rename from 4.4.rc/php8.0/fpm-alpine/makedb.php rename to 4.4/php8.0/fpm-alpine/makedb.php diff --git a/4.4.rc/php8.0/fpm/Dockerfile b/4.4/php8.0/fpm/Dockerfile similarity index 94% rename from 4.4.rc/php8.0/fpm/Dockerfile rename to 4.4/php8.0/fpm/Dockerfile index 53a9382..1ad1e61 100644 --- a/4.4.rc/php8.0/fpm/Dockerfile +++ b/4.4/php8.0/fpm/Dockerfile @@ -132,12 +132,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.0-rc1 -ENV JOOMLA_SHA512 f71fd1fd1ba32630b6fb26854b7bb7bc09a9985407cd6138d57e0f7c91afb6f92c3ac3169f13323f144ebe89e7eb1d85b1ad0aa950812f23347224fe2037bca1 +ENV JOOMLA_VERSION 4.4.0 +ENV JOOMLA_SHA512 800e985b1aa99e0df329349779f3c0f2f29a5c4de5115a7804b118029cba6f8d726cbd09979e3ac5a13e6a518ff87f847e713be9fa38ee59b04a5e9102479838 # 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.4.0-rc1/Joomla_4.4.0-rc1-Release_Candidate-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.0/Joomla_4.4.0-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.4.rc/php8.0/fpm/docker-entrypoint.sh b/4.4/php8.0/fpm/docker-entrypoint.sh similarity index 100% rename from 4.4.rc/php8.0/fpm/docker-entrypoint.sh rename to 4.4/php8.0/fpm/docker-entrypoint.sh diff --git a/4.4.rc/php8.0/fpm/makedb.php b/4.4/php8.0/fpm/makedb.php similarity index 100% rename from 4.4.rc/php8.0/fpm/makedb.php rename to 4.4/php8.0/fpm/makedb.php diff --git a/5.0.rc/php8.1/apache/Dockerfile b/4.4/php8.1/apache/Dockerfile similarity index 95% rename from 5.0.rc/php8.1/apache/Dockerfile rename to 4.4/php8.1/apache/Dockerfile index 3446868..c657b6b 100644 --- a/5.0.rc/php8.1/apache/Dockerfile +++ b/4.4/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 5.0.0-rc1 -ENV JOOMLA_SHA512 23dd5e229c36d6e2f94582e515f7c6283e060eeb2ad3781055a409cc5891a2ea386d6a0980954710e6fc841dccfd87b01b75836e907a5b3164cc8daf78e8a252 +ENV JOOMLA_VERSION 4.4.0 +ENV JOOMLA_SHA512 800e985b1aa99e0df329349779f3c0f2f29a5c4de5115a7804b118029cba6f8d726cbd09979e3ac5a13e6a518ff87f847e713be9fa38ee59b04a5e9102479838 # Download package and extract to web volume RUN set -ex; \ - curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/5.0.0-rc/Joomla_5.0.0-rc-Release_Candidate-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.0/Joomla_4.4.0-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.4.rc/php8.1/apache/docker-entrypoint.sh b/4.4/php8.1/apache/docker-entrypoint.sh similarity index 100% rename from 4.4.rc/php8.1/apache/docker-entrypoint.sh rename to 4.4/php8.1/apache/docker-entrypoint.sh diff --git a/4.4.rc/php8.1/apache/makedb.php b/4.4/php8.1/apache/makedb.php similarity index 100% rename from 4.4.rc/php8.1/apache/makedb.php rename to 4.4/php8.1/apache/makedb.php diff --git a/5.0.rc/php8.1/fpm-alpine/Dockerfile b/4.4/php8.1/fpm-alpine/Dockerfile similarity index 94% rename from 5.0.rc/php8.1/fpm-alpine/Dockerfile rename to 4.4/php8.1/fpm-alpine/Dockerfile index 5ea2c0b..32468ed 100644 --- a/5.0.rc/php8.1/fpm-alpine/Dockerfile +++ b/4.4/php8.1/fpm-alpine/Dockerfile @@ -130,12 +130,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.0.0-rc1 -ENV JOOMLA_SHA512 23dd5e229c36d6e2f94582e515f7c6283e060eeb2ad3781055a409cc5891a2ea386d6a0980954710e6fc841dccfd87b01b75836e907a5b3164cc8daf78e8a252 +ENV JOOMLA_VERSION 4.4.0 +ENV JOOMLA_SHA512 800e985b1aa99e0df329349779f3c0f2f29a5c4de5115a7804b118029cba6f8d726cbd09979e3ac5a13e6a518ff87f847e713be9fa38ee59b04a5e9102479838 # Download package and extract to web volume RUN set -ex; \ - curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/5.0.0-rc/Joomla_5.0.0-rc-Release_Candidate-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.0/Joomla_4.4.0-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.4.rc/php8.1/fpm-alpine/docker-entrypoint.sh b/4.4/php8.1/fpm-alpine/docker-entrypoint.sh similarity index 100% rename from 4.4.rc/php8.1/fpm-alpine/docker-entrypoint.sh rename to 4.4/php8.1/fpm-alpine/docker-entrypoint.sh diff --git a/4.4.rc/php8.1/fpm-alpine/makedb.php b/4.4/php8.1/fpm-alpine/makedb.php similarity index 100% rename from 4.4.rc/php8.1/fpm-alpine/makedb.php rename to 4.4/php8.1/fpm-alpine/makedb.php diff --git a/5.0.rc/php8.1/fpm/Dockerfile b/4.4/php8.1/fpm/Dockerfile similarity index 94% rename from 5.0.rc/php8.1/fpm/Dockerfile rename to 4.4/php8.1/fpm/Dockerfile index 8bd90c4..0cf2edb 100644 --- a/5.0.rc/php8.1/fpm/Dockerfile +++ b/4.4/php8.1/fpm/Dockerfile @@ -132,12 +132,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.0.0-rc1 -ENV JOOMLA_SHA512 23dd5e229c36d6e2f94582e515f7c6283e060eeb2ad3781055a409cc5891a2ea386d6a0980954710e6fc841dccfd87b01b75836e907a5b3164cc8daf78e8a252 +ENV JOOMLA_VERSION 4.4.0 +ENV JOOMLA_SHA512 800e985b1aa99e0df329349779f3c0f2f29a5c4de5115a7804b118029cba6f8d726cbd09979e3ac5a13e6a518ff87f847e713be9fa38ee59b04a5e9102479838 # Download package and extract to web volume RUN set -ex; \ - curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/5.0.0-rc/Joomla_5.0.0-rc-Release_Candidate-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.0/Joomla_4.4.0-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.4.rc/php8.1/fpm/docker-entrypoint.sh b/4.4/php8.1/fpm/docker-entrypoint.sh similarity index 100% rename from 4.4.rc/php8.1/fpm/docker-entrypoint.sh rename to 4.4/php8.1/fpm/docker-entrypoint.sh diff --git a/4.4.rc/php8.1/fpm/makedb.php b/4.4/php8.1/fpm/makedb.php similarity index 100% rename from 4.4.rc/php8.1/fpm/makedb.php rename to 4.4/php8.1/fpm/makedb.php diff --git a/5.0.rc/php8.2/apache/Dockerfile b/4.4/php8.2/apache/Dockerfile similarity index 95% rename from 5.0.rc/php8.2/apache/Dockerfile rename to 4.4/php8.2/apache/Dockerfile index f3a1deb..78d9f58 100644 --- a/5.0.rc/php8.2/apache/Dockerfile +++ b/4.4/php8.2/apache/Dockerfile @@ -150,12 +150,12 @@ RUN set -eux; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.0.0-rc1 -ENV JOOMLA_SHA512 23dd5e229c36d6e2f94582e515f7c6283e060eeb2ad3781055a409cc5891a2ea386d6a0980954710e6fc841dccfd87b01b75836e907a5b3164cc8daf78e8a252 +ENV JOOMLA_VERSION 4.4.0 +ENV JOOMLA_SHA512 800e985b1aa99e0df329349779f3c0f2f29a5c4de5115a7804b118029cba6f8d726cbd09979e3ac5a13e6a518ff87f847e713be9fa38ee59b04a5e9102479838 # Download package and extract to web volume RUN set -ex; \ - curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/5.0.0-rc/Joomla_5.0.0-rc-Release_Candidate-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.0/Joomla_4.4.0-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.4.rc/php8.2/apache/docker-entrypoint.sh b/4.4/php8.2/apache/docker-entrypoint.sh similarity index 100% rename from 4.4.rc/php8.2/apache/docker-entrypoint.sh rename to 4.4/php8.2/apache/docker-entrypoint.sh diff --git a/4.4.rc/php8.2/apache/makedb.php b/4.4/php8.2/apache/makedb.php similarity index 100% rename from 4.4.rc/php8.2/apache/makedb.php rename to 4.4/php8.2/apache/makedb.php diff --git a/5.0.rc/php8.2/fpm-alpine/Dockerfile b/4.4/php8.2/fpm-alpine/Dockerfile similarity index 94% rename from 5.0.rc/php8.2/fpm-alpine/Dockerfile rename to 4.4/php8.2/fpm-alpine/Dockerfile index 27cbd32..472f405 100644 --- a/5.0.rc/php8.2/fpm-alpine/Dockerfile +++ b/4.4/php8.2/fpm-alpine/Dockerfile @@ -130,12 +130,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.0.0-rc1 -ENV JOOMLA_SHA512 23dd5e229c36d6e2f94582e515f7c6283e060eeb2ad3781055a409cc5891a2ea386d6a0980954710e6fc841dccfd87b01b75836e907a5b3164cc8daf78e8a252 +ENV JOOMLA_VERSION 4.4.0 +ENV JOOMLA_SHA512 800e985b1aa99e0df329349779f3c0f2f29a5c4de5115a7804b118029cba6f8d726cbd09979e3ac5a13e6a518ff87f847e713be9fa38ee59b04a5e9102479838 # Download package and extract to web volume RUN set -ex; \ - curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/5.0.0-rc/Joomla_5.0.0-rc-Release_Candidate-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.0/Joomla_4.4.0-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.4.rc/php8.2/fpm-alpine/docker-entrypoint.sh b/4.4/php8.2/fpm-alpine/docker-entrypoint.sh similarity index 100% rename from 4.4.rc/php8.2/fpm-alpine/docker-entrypoint.sh rename to 4.4/php8.2/fpm-alpine/docker-entrypoint.sh diff --git a/4.4.rc/php8.2/fpm-alpine/makedb.php b/4.4/php8.2/fpm-alpine/makedb.php similarity index 100% rename from 4.4.rc/php8.2/fpm-alpine/makedb.php rename to 4.4/php8.2/fpm-alpine/makedb.php diff --git a/5.0.rc/php8.2/fpm/Dockerfile b/4.4/php8.2/fpm/Dockerfile similarity index 94% rename from 5.0.rc/php8.2/fpm/Dockerfile rename to 4.4/php8.2/fpm/Dockerfile index 106e047..596776c 100644 --- a/5.0.rc/php8.2/fpm/Dockerfile +++ b/4.4/php8.2/fpm/Dockerfile @@ -132,12 +132,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.0.0-rc1 -ENV JOOMLA_SHA512 23dd5e229c36d6e2f94582e515f7c6283e060eeb2ad3781055a409cc5891a2ea386d6a0980954710e6fc841dccfd87b01b75836e907a5b3164cc8daf78e8a252 +ENV JOOMLA_VERSION 4.4.0 +ENV JOOMLA_SHA512 800e985b1aa99e0df329349779f3c0f2f29a5c4de5115a7804b118029cba6f8d726cbd09979e3ac5a13e6a518ff87f847e713be9fa38ee59b04a5e9102479838 # Download package and extract to web volume RUN set -ex; \ - curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/5.0.0-rc/Joomla_5.0.0-rc-Release_Candidate-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.0/Joomla_4.4.0-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.4.rc/php8.2/fpm/docker-entrypoint.sh b/4.4/php8.2/fpm/docker-entrypoint.sh similarity index 100% rename from 4.4.rc/php8.2/fpm/docker-entrypoint.sh rename to 4.4/php8.2/fpm/docker-entrypoint.sh diff --git a/4.4.rc/php8.2/fpm/makedb.php b/4.4/php8.2/fpm/makedb.php similarity index 100% rename from 4.4.rc/php8.2/fpm/makedb.php rename to 4.4/php8.2/fpm/makedb.php diff --git a/4.4.rc/php8.1/apache/Dockerfile b/5.0/php8.1/apache/Dockerfile similarity index 90% rename from 4.4.rc/php8.1/apache/Dockerfile rename to 5.0/php8.1/apache/Dockerfile index 4f265df..1f2bef1 100644 --- a/4.4.rc/php8.1/apache/Dockerfile +++ b/5.0/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/* @@ -150,16 +152,16 @@ RUN set -eux; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.0-rc1 -ENV JOOMLA_SHA512 f71fd1fd1ba32630b6fb26854b7bb7bc09a9985407cd6138d57e0f7c91afb6f92c3ac3169f13323f144ebe89e7eb1d85b1ad0aa950812f23347224fe2037bca1 +ENV JOOMLA_VERSION 5.0.0 +ENV JOOMLA_SHA512 329686ee26a650d504541e605463fa98af8f1403e5ba79c29e1091559ee9faff4194a2b346a300ddd990a3ac307bf12851f65de5c63f5785e8c01e737e0c7f79 # 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.4.0-rc1/Joomla_4.4.0-rc1-Release_Candidate-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.0.0/Joomla_5.0.0-Stable-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/5.0.rc/php8.1/apache/docker-entrypoint.sh b/5.0/php8.1/apache/docker-entrypoint.sh similarity index 100% rename from 5.0.rc/php8.1/apache/docker-entrypoint.sh rename to 5.0/php8.1/apache/docker-entrypoint.sh diff --git a/5.0.rc/php8.1/apache/makedb.php b/5.0/php8.1/apache/makedb.php similarity index 100% rename from 5.0.rc/php8.1/apache/makedb.php rename to 5.0/php8.1/apache/makedb.php diff --git a/4.4.rc/php8.1/fpm-alpine/Dockerfile b/5.0/php8.1/fpm-alpine/Dockerfile similarity index 89% rename from 4.4.rc/php8.1/fpm-alpine/Dockerfile rename to 5.0/php8.1/fpm-alpine/Dockerfile index a0912eb..320777f 100644 --- a/4.4.rc/php8.1/fpm-alpine/Dockerfile +++ b/5.0/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. @@ -130,16 +132,16 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.0-rc1 -ENV JOOMLA_SHA512 f71fd1fd1ba32630b6fb26854b7bb7bc09a9985407cd6138d57e0f7c91afb6f92c3ac3169f13323f144ebe89e7eb1d85b1ad0aa950812f23347224fe2037bca1 +ENV JOOMLA_VERSION 5.0.0 +ENV JOOMLA_SHA512 329686ee26a650d504541e605463fa98af8f1403e5ba79c29e1091559ee9faff4194a2b346a300ddd990a3ac307bf12851f65de5c63f5785e8c01e737e0c7f79 # 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.4.0-rc1/Joomla_4.4.0-rc1-Release_Candidate-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.0.0/Joomla_5.0.0-Stable-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/5.0.rc/php8.1/fpm-alpine/docker-entrypoint.sh b/5.0/php8.1/fpm-alpine/docker-entrypoint.sh similarity index 100% rename from 5.0.rc/php8.1/fpm-alpine/docker-entrypoint.sh rename to 5.0/php8.1/fpm-alpine/docker-entrypoint.sh diff --git a/5.0.rc/php8.1/fpm-alpine/makedb.php b/5.0/php8.1/fpm-alpine/makedb.php similarity index 100% rename from 5.0.rc/php8.1/fpm-alpine/makedb.php rename to 5.0/php8.1/fpm-alpine/makedb.php diff --git a/4.4.rc/php8.1/fpm/Dockerfile b/5.0/php8.1/fpm/Dockerfile similarity index 89% rename from 4.4.rc/php8.1/fpm/Dockerfile rename to 5.0/php8.1/fpm/Dockerfile index e6ca319..6c4cedc 100644 --- a/4.4.rc/php8.1/fpm/Dockerfile +++ b/5.0/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/* @@ -132,16 +134,16 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.0-rc1 -ENV JOOMLA_SHA512 f71fd1fd1ba32630b6fb26854b7bb7bc09a9985407cd6138d57e0f7c91afb6f92c3ac3169f13323f144ebe89e7eb1d85b1ad0aa950812f23347224fe2037bca1 +ENV JOOMLA_VERSION 5.0.0 +ENV JOOMLA_SHA512 329686ee26a650d504541e605463fa98af8f1403e5ba79c29e1091559ee9faff4194a2b346a300ddd990a3ac307bf12851f65de5c63f5785e8c01e737e0c7f79 # 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.4.0-rc1/Joomla_4.4.0-rc1-Release_Candidate-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.0.0/Joomla_5.0.0-Stable-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/5.0.rc/php8.1/fpm/docker-entrypoint.sh b/5.0/php8.1/fpm/docker-entrypoint.sh similarity index 100% rename from 5.0.rc/php8.1/fpm/docker-entrypoint.sh rename to 5.0/php8.1/fpm/docker-entrypoint.sh diff --git a/5.0.rc/php8.1/fpm/makedb.php b/5.0/php8.1/fpm/makedb.php similarity index 100% rename from 5.0.rc/php8.1/fpm/makedb.php rename to 5.0/php8.1/fpm/makedb.php diff --git a/4.4.rc/php8.2/apache/Dockerfile b/5.0/php8.2/apache/Dockerfile similarity index 90% rename from 4.4.rc/php8.2/apache/Dockerfile rename to 5.0/php8.2/apache/Dockerfile index 5e92f21..31d662d 100644 --- a/4.4.rc/php8.2/apache/Dockerfile +++ b/5.0/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/* @@ -150,16 +152,16 @@ RUN set -eux; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.0-rc1 -ENV JOOMLA_SHA512 f71fd1fd1ba32630b6fb26854b7bb7bc09a9985407cd6138d57e0f7c91afb6f92c3ac3169f13323f144ebe89e7eb1d85b1ad0aa950812f23347224fe2037bca1 +ENV JOOMLA_VERSION 5.0.0 +ENV JOOMLA_SHA512 329686ee26a650d504541e605463fa98af8f1403e5ba79c29e1091559ee9faff4194a2b346a300ddd990a3ac307bf12851f65de5c63f5785e8c01e737e0c7f79 # 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.4.0-rc1/Joomla_4.4.0-rc1-Release_Candidate-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.0.0/Joomla_5.0.0-Stable-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/5.0.rc/php8.2/apache/docker-entrypoint.sh b/5.0/php8.2/apache/docker-entrypoint.sh similarity index 100% rename from 5.0.rc/php8.2/apache/docker-entrypoint.sh rename to 5.0/php8.2/apache/docker-entrypoint.sh diff --git a/5.0.rc/php8.2/apache/makedb.php b/5.0/php8.2/apache/makedb.php similarity index 100% rename from 5.0.rc/php8.2/apache/makedb.php rename to 5.0/php8.2/apache/makedb.php diff --git a/4.4.rc/php8.2/fpm-alpine/Dockerfile b/5.0/php8.2/fpm-alpine/Dockerfile similarity index 89% rename from 4.4.rc/php8.2/fpm-alpine/Dockerfile rename to 5.0/php8.2/fpm-alpine/Dockerfile index 1f164c6..7e49641 100644 --- a/4.4.rc/php8.2/fpm-alpine/Dockerfile +++ b/5.0/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. @@ -130,16 +132,16 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.0-rc1 -ENV JOOMLA_SHA512 f71fd1fd1ba32630b6fb26854b7bb7bc09a9985407cd6138d57e0f7c91afb6f92c3ac3169f13323f144ebe89e7eb1d85b1ad0aa950812f23347224fe2037bca1 +ENV JOOMLA_VERSION 5.0.0 +ENV JOOMLA_SHA512 329686ee26a650d504541e605463fa98af8f1403e5ba79c29e1091559ee9faff4194a2b346a300ddd990a3ac307bf12851f65de5c63f5785e8c01e737e0c7f79 # 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.4.0-rc1/Joomla_4.4.0-rc1-Release_Candidate-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.0.0/Joomla_5.0.0-Stable-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/5.0.rc/php8.2/fpm-alpine/docker-entrypoint.sh b/5.0/php8.2/fpm-alpine/docker-entrypoint.sh similarity index 100% rename from 5.0.rc/php8.2/fpm-alpine/docker-entrypoint.sh rename to 5.0/php8.2/fpm-alpine/docker-entrypoint.sh diff --git a/5.0.rc/php8.2/fpm-alpine/makedb.php b/5.0/php8.2/fpm-alpine/makedb.php similarity index 100% rename from 5.0.rc/php8.2/fpm-alpine/makedb.php rename to 5.0/php8.2/fpm-alpine/makedb.php diff --git a/4.4.rc/php8.2/fpm/Dockerfile b/5.0/php8.2/fpm/Dockerfile similarity index 89% rename from 4.4.rc/php8.2/fpm/Dockerfile rename to 5.0/php8.2/fpm/Dockerfile index e97bc2b..8e3968a 100644 --- a/4.4.rc/php8.2/fpm/Dockerfile +++ b/5.0/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/* @@ -132,16 +134,16 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.0-rc1 -ENV JOOMLA_SHA512 f71fd1fd1ba32630b6fb26854b7bb7bc09a9985407cd6138d57e0f7c91afb6f92c3ac3169f13323f144ebe89e7eb1d85b1ad0aa950812f23347224fe2037bca1 +ENV JOOMLA_VERSION 5.0.0 +ENV JOOMLA_SHA512 329686ee26a650d504541e605463fa98af8f1403e5ba79c29e1091559ee9faff4194a2b346a300ddd990a3ac307bf12851f65de5c63f5785e8c01e737e0c7f79 # 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.4.0-rc1/Joomla_4.4.0-rc1-Release_Candidate-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.0.0/Joomla_5.0.0-Stable-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/5.0.rc/php8.2/fpm/docker-entrypoint.sh b/5.0/php8.2/fpm/docker-entrypoint.sh similarity index 100% rename from 5.0.rc/php8.2/fpm/docker-entrypoint.sh rename to 5.0/php8.2/fpm/docker-entrypoint.sh diff --git a/5.0.rc/php8.2/fpm/makedb.php b/5.0/php8.2/fpm/makedb.php similarity index 100% rename from 5.0.rc/php8.2/fpm/makedb.php rename to 5.0/php8.2/fpm/makedb.php diff --git a/Dockerfile.template b/Dockerfile.template index ca23639..189e818 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -17,6 +17,10 @@ RUN set -eux; \ ghostscript \ # Alpine package for "imagemagick" contains ~120 .so files imagemagick \ +{{ if env.joomlaPackageType == "tar.zst" then ( -}} +# Needed for the zst joomla package + zstd \ +{{ ) else "" end -}} ; {{ ) else ( -}} RUN set -eux; \ @@ -24,6 +28,10 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ # Ghostscript is required for rendering PDF previews ghostscript \ +{{ if env.joomlaPackageType == "tar.zst" then ( -}} +# Needed for the zst joomla package + zstd \ +{{ ) else "" end -}} ; \ rm -rf /var/lib/apt/lists/* {{ ) end -}} @@ -236,11 +244,15 @@ ENV JOOMLA_SHA512 {{ env.joomlaSha512 }} # Download package and extract to web volume RUN set -ex; \ - curl -o joomla.tar.bz2 -SL {{ env.joomlaPackage }}; \ - echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \ + curl -o joomla.{{ env.joomlaPackageType }} -SL {{ env.joomlaPackage }}; \ + echo "$JOOMLA_SHA512 *joomla.{{ env.joomlaPackageType }}" | sha512sum -c -; \ mkdir /usr/src/joomla; \ +{{ if env.joomlaPackageType == "tar.zst" then ( -}} + tar --zstd -xf joomla.tar.zst -C /usr/src/joomla; \ +{{ ) else ( -}} tar -xf joomla.tar.bz2 -C /usr/src/joomla; \ - rm joomla.tar.bz2; \ +{{ ) end -}} + rm joomla.{{ env.joomlaPackageType }}; \ chown -R www-data:www-data /usr/src/joomla # Copy init scripts diff --git a/apply-templates.sh b/apply-templates.sh index d689d1f..1e1e21f 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -58,6 +58,9 @@ for version; do # get this version Joomla Package URL joomlaPackage="$(echo "${joomlaVersionDetails}" | jq -r '.package')" export joomlaPackage + # get this version Joomla Package Type + joomlaPackageType="$(echo "${joomlaVersionDetails}" | jq -r '.packageType')" + export joomlaPackageType for phpVersion in "${phpVersions[@]}"; do export phpVersion diff --git a/versions-helper.json b/versions-helper.json index e1f88fb..c070c3d 100644 --- a/versions-helper.json +++ b/versions-helper.json @@ -1,9 +1,9 @@ { - "5.0.rc": { - "version": "5.0.0-rc1", - "package": "https://github.com/joomla/joomla-cms/releases/download/5.0.0-rc/Joomla_5.0.0-rc-Release_Candidate-Full_Package.tar.bz2", + "5.0": { + "version": "5.0.0", + "packageType": "tar.zst", "php": "8.2", - "aliases": ["5.0.0-rc"], + "aliases": ["5.0.0"], "phpVersions": { "8.2": { "pecl": { @@ -27,11 +27,10 @@ "fpm" ] }, - "4.4.rc": { - "version": "4.4.0-rc1", - "package": "https://github.com/joomla/joomla-cms/releases/download/4.4.0-rc1/Joomla_4.4.0-rc1-Release_Candidate-Full_Package.tar.bz2", + "4.4": { + "version": "4.4.0", "php": "8.1", - "aliases": ["4.4.0-rc"], + "aliases": ["4.4.0"], "phpVersions": { "8.2": { "pecl": { @@ -64,7 +63,7 @@ }, "4.3": { "version": "4.3.4", - "php": "8.0", + "php": "8.1", "aliases": [4, "latest"], "phpVersions": { "8.2": { diff --git a/versions.json b/versions.json index 23f6a48..d87b673 100644 --- a/versions.json +++ b/versions.json @@ -4,6 +4,7 @@ 3 ], "package": "https://github.com/joomla/joomla-cms/releases/download/3.10.12/Joomla_3.10.12-Stable-Full_Package.tar.bz2", + "packageType": "tar.bz2", "php": "8.0", "phpVersions": [ "8.0" @@ -23,7 +24,8 @@ "latest" ], "package": "https://github.com/joomla/joomla-cms/releases/download/4.3.4/Joomla_4.3.4-Stable-Full_Package.tar.bz2", - "php": "8.0", + "packageType": "tar.bz2", + "php": "8.1", "phpVersions": [ "8.0", "8.1", @@ -38,43 +40,45 @@ ], "version": "4.3.4" }, - "4.4.rc": { + "4.4": { "aliases": [ - "4.4.0-rc" + "4.4.0" ], - "package": "https://github.com/joomla/joomla-cms/releases/download/4.4.0-rc1/Joomla_4.4.0-rc1-Release_Candidate-Full_Package.tar.bz2", + "package": "https://github.com/joomla/joomla-cms/releases/download/4.4.0/Joomla_4.4.0-Stable-Full_Package.tar.bz2", + "packageType": "tar.bz2", "php": "8.1", "phpVersions": [ "8.0", "8.1", "8.2" ], - "sha512": "f71fd1fd1ba32630b6fb26854b7bb7bc09a9985407cd6138d57e0f7c91afb6f92c3ac3169f13323f144ebe89e7eb1d85b1ad0aa950812f23347224fe2037bca1", + "sha512": "800e985b1aa99e0df329349779f3c0f2f29a5c4de5115a7804b118029cba6f8d726cbd09979e3ac5a13e6a518ff87f847e713be9fa38ee59b04a5e9102479838", "variant": "apache", "variants": [ "apache", "fpm-alpine", "fpm" ], - "version": "4.4.0-rc1" + "version": "4.4.0" }, - "5.0.rc": { + "5.0": { "aliases": [ - "5.0.0-rc" + "5.0.0" ], - "package": "https://github.com/joomla/joomla-cms/releases/download/5.0.0-rc/Joomla_5.0.0-rc-Release_Candidate-Full_Package.tar.bz2", + "package": "https://github.com/joomla/joomla-cms/releases/download/5.0.0/Joomla_5.0.0-Stable-Full_Package.tar.zst", + "packageType": "tar.zst", "php": "8.2", "phpVersions": [ "8.1", "8.2" ], - "sha512": "23dd5e229c36d6e2f94582e515f7c6283e060eeb2ad3781055a409cc5891a2ea386d6a0980954710e6fc841dccfd87b01b75836e907a5b3164cc8daf78e8a252", + "sha512": "329686ee26a650d504541e605463fa98af8f1403e5ba79c29e1091559ee9faff4194a2b346a300ddd990a3ac307bf12851f65de5c63f5785e8c01e737e0c7f79", "variant": "apache", "variants": [ "apache", "fpm-alpine", "fpm" ], - "version": "5.0.0-rc1" + "version": "5.0.0" } } diff --git a/versions.sh b/versions.sh index bb49c61..9c4292f 100755 --- a/versions.sh +++ b/versions.sh @@ -40,32 +40,38 @@ for version in "${versions[@]}"; do fullVersion=$(echo $versionsHelper | jq -r '.[env.version].version') export fullVersion - # lets see if we have a tar URL + # lets see if we have a source URL package=$(echo $versionsHelper | jq -r '.[env.version].package') + packageType=$(echo $versionsHelper | jq -r '.[env.version].packageType') + if [ -z "$packageType" ] || [ "$packageType" = "null" ]; then + packageType="tar.bz2" + fi # when not found we load sha512 from API - if [ "${package}" = 'null' ]; then + if [ -z "${package}" ] || [ "${package}" = 'null' ]; then # get the url version urlVersion=$(echo $fullVersion | sed -e 's/\./-/g') # get the hash - sha512="$(curl -fsSL "https://downloads.joomla.org/api/v1/signatures/cms/$urlVersion" | jq -r --arg file "Joomla_${fullVersion}-Stable-Full_Package.tar.bz2" '.[] | .[] | select(.filename == $file).sha512')" + sha512="$(curl -fsSL "https://downloads.joomla.org/api/v1/signatures/cms/$urlVersion" | jq -r --arg file "Joomla_${fullVersion}-Stable-Full_Package.${packageType}" '.[] | .[] | select(.filename == $file).sha512')" # set the full URL for the IMAGES - package="https://github.com/joomla/joomla-cms/releases/download/${fullVersion}/Joomla_${fullVersion}-Stable-Full_Package.tar.bz2" + package="https://github.com/joomla/joomla-cms/releases/download/${fullVersion}/Joomla_${fullVersion}-Stable-Full_Package.${packageType}" else # we get the sha from the package - curl -o joomla.tar.bz2 -SL "${package}" &>/dev/null + curl -o "joomla.${packageType}" -SL "${package}" &>/dev/null # get the hash - sha512=$(sha512sum joomla.tar.bz2 | cut -d " " -f 1) + sha512=$(sha512sum "joomla.${packageType}" | cut -d " " -f 1) # remove the file - rm joomla.tar.bz2 + rm "joomla.${packageType}" fi # set the hash to the JSON - if [ -n "$sha512" ] && [ -n "$package" ]; then + if [ -n "$sha512" ] && [ -n "$package" ] && [ -n "$packageType" ]; then export sha512 export package + export packageType doc="$(jq <<<"$doc" -c '.sha512 = env.sha512')" doc="$(jq <<<"$doc" -c '.package = env.package')" + doc="$(jq <<<"$doc" -c '.packageType = env.packageType')" fi # get the default php version