From c3eaadecfa5292367ad9911e8cae159b3224e349 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Tue, 16 Apr 2024 19:25:41 +0200 Subject: [PATCH] Add Joomla 5.1.0 Removes Joomla 5.1.0-beta and Joomla 5.0.3. Update Joomla 4.4.3 to 4.4.4 --- 4.4/php8.1/apache/Dockerfile | 6 +- 4.4/php8.1/fpm-alpine/Dockerfile | 6 +- 4.4/php8.1/fpm/Dockerfile | 6 +- 4.4/php8.2/apache/Dockerfile | 6 +- 4.4/php8.2/fpm-alpine/Dockerfile | 6 +- 4.4/php8.2/fpm/Dockerfile | 6 +- 5.1.beta/php8.1/apache/Dockerfile | 173 ------------ 5.1.beta/php8.1/apache/docker-entrypoint.sh | 249 ------------------ 5.1.beta/php8.1/apache/makedb.php | 102 ------- 5.1.beta/php8.1/fpm-alpine/Dockerfile | 154 ----------- .../php8.1/fpm-alpine/docker-entrypoint.sh | 249 ------------------ 5.1.beta/php8.1/fpm-alpine/makedb.php | 102 ------- 5.1.beta/php8.1/fpm/Dockerfile | 156 ----------- 5.1.beta/php8.1/fpm/docker-entrypoint.sh | 249 ------------------ 5.1.beta/php8.1/fpm/makedb.php | 102 ------- 5.1.beta/php8.2/apache/Dockerfile | 173 ------------ 5.1.beta/php8.2/apache/docker-entrypoint.sh | 249 ------------------ 5.1.beta/php8.2/apache/makedb.php | 102 ------- 5.1.beta/php8.2/fpm-alpine/Dockerfile | 154 ----------- .../php8.2/fpm-alpine/docker-entrypoint.sh | 249 ------------------ 5.1.beta/php8.2/fpm-alpine/makedb.php | 102 ------- 5.1.beta/php8.2/fpm/Dockerfile | 156 ----------- 5.1.beta/php8.2/fpm/docker-entrypoint.sh | 249 ------------------ 5.1.beta/php8.2/fpm/makedb.php | 102 ------- {5.0 => 5.1}/php8.1/apache/Dockerfile | 6 +- .../php8.1/apache/docker-entrypoint.sh | 0 {5.0 => 5.1}/php8.1/apache/makedb.php | 0 {5.0 => 5.1}/php8.1/fpm-alpine/Dockerfile | 6 +- .../php8.1/fpm-alpine/docker-entrypoint.sh | 0 {5.0 => 5.1}/php8.1/fpm-alpine/makedb.php | 0 {5.0 => 5.1}/php8.1/fpm/Dockerfile | 6 +- {5.0 => 5.1}/php8.1/fpm/docker-entrypoint.sh | 0 {5.0 => 5.1}/php8.1/fpm/makedb.php | 0 {5.0 => 5.1}/php8.2/apache/Dockerfile | 6 +- .../php8.2/apache/docker-entrypoint.sh | 0 {5.0 => 5.1}/php8.2/apache/makedb.php | 0 {5.0 => 5.1}/php8.2/fpm-alpine/Dockerfile | 6 +- .../php8.2/fpm-alpine/docker-entrypoint.sh | 0 {5.0 => 5.1}/php8.2/fpm-alpine/makedb.php | 0 {5.0 => 5.1}/php8.2/fpm/Dockerfile | 6 +- {5.0 => 5.1}/php8.2/fpm/docker-entrypoint.sh | 0 {5.0 => 5.1}/php8.2/fpm/makedb.php | 0 versions-helper.json | 39 +-- versions.json | 40 +-- 44 files changed, 51 insertions(+), 3172 deletions(-) delete mode 100644 5.1.beta/php8.1/apache/Dockerfile delete mode 100755 5.1.beta/php8.1/apache/docker-entrypoint.sh delete mode 100644 5.1.beta/php8.1/apache/makedb.php delete mode 100644 5.1.beta/php8.1/fpm-alpine/Dockerfile delete mode 100755 5.1.beta/php8.1/fpm-alpine/docker-entrypoint.sh delete mode 100644 5.1.beta/php8.1/fpm-alpine/makedb.php delete mode 100644 5.1.beta/php8.1/fpm/Dockerfile delete mode 100755 5.1.beta/php8.1/fpm/docker-entrypoint.sh delete mode 100644 5.1.beta/php8.1/fpm/makedb.php delete mode 100644 5.1.beta/php8.2/apache/Dockerfile delete mode 100755 5.1.beta/php8.2/apache/docker-entrypoint.sh delete mode 100644 5.1.beta/php8.2/apache/makedb.php delete mode 100644 5.1.beta/php8.2/fpm-alpine/Dockerfile delete mode 100755 5.1.beta/php8.2/fpm-alpine/docker-entrypoint.sh delete mode 100644 5.1.beta/php8.2/fpm-alpine/makedb.php delete mode 100644 5.1.beta/php8.2/fpm/Dockerfile delete mode 100755 5.1.beta/php8.2/fpm/docker-entrypoint.sh delete mode 100644 5.1.beta/php8.2/fpm/makedb.php rename {5.0 => 5.1}/php8.1/apache/Dockerfile (95%) rename {5.0 => 5.1}/php8.1/apache/docker-entrypoint.sh (100%) rename {5.0 => 5.1}/php8.1/apache/makedb.php (100%) rename {5.0 => 5.1}/php8.1/fpm-alpine/Dockerfile (94%) rename {5.0 => 5.1}/php8.1/fpm-alpine/docker-entrypoint.sh (100%) rename {5.0 => 5.1}/php8.1/fpm-alpine/makedb.php (100%) rename {5.0 => 5.1}/php8.1/fpm/Dockerfile (94%) rename {5.0 => 5.1}/php8.1/fpm/docker-entrypoint.sh (100%) rename {5.0 => 5.1}/php8.1/fpm/makedb.php (100%) rename {5.0 => 5.1}/php8.2/apache/Dockerfile (95%) rename {5.0 => 5.1}/php8.2/apache/docker-entrypoint.sh (100%) rename {5.0 => 5.1}/php8.2/apache/makedb.php (100%) rename {5.0 => 5.1}/php8.2/fpm-alpine/Dockerfile (94%) rename {5.0 => 5.1}/php8.2/fpm-alpine/docker-entrypoint.sh (100%) rename {5.0 => 5.1}/php8.2/fpm-alpine/makedb.php (100%) rename {5.0 => 5.1}/php8.2/fpm/Dockerfile (94%) rename {5.0 => 5.1}/php8.2/fpm/docker-entrypoint.sh (100%) rename {5.0 => 5.1}/php8.2/fpm/makedb.php (100%) diff --git a/4.4/php8.1/apache/Dockerfile b/4.4/php8.1/apache/Dockerfile index 0cab88b..76a0de3 100644 --- a/4.4/php8.1/apache/Dockerfile +++ b/4.4/php8.1/apache/Dockerfile @@ -149,12 +149,12 @@ RUN set -eux; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.3 -ENV JOOMLA_SHA512 40be1f6d16430b4d0f7fde1ac2c96245388f28031790757e667b5ab52802105aec1ce51efdaa13576082218e0842c893d884a78f1ef358bec6fa1fb0a2cdabcd +ENV JOOMLA_VERSION 4.4.4 +ENV JOOMLA_SHA512 782469e12a7e6ceb719e4fca5e839d1bd5e475b2b3a932a4262ecc51b2585e94dede017021b5075b2e36c2687b27a82350064b5cc74fb27761987cff55e8637f # 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.3/Joomla_4.4.3-Stable-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.4/Joomla_4.4.4-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/php8.1/fpm-alpine/Dockerfile b/4.4/php8.1/fpm-alpine/Dockerfile index 13818cb..681f3f8 100644 --- a/4.4/php8.1/fpm-alpine/Dockerfile +++ b/4.4/php8.1/fpm-alpine/Dockerfile @@ -129,12 +129,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.3 -ENV JOOMLA_SHA512 40be1f6d16430b4d0f7fde1ac2c96245388f28031790757e667b5ab52802105aec1ce51efdaa13576082218e0842c893d884a78f1ef358bec6fa1fb0a2cdabcd +ENV JOOMLA_VERSION 4.4.4 +ENV JOOMLA_SHA512 782469e12a7e6ceb719e4fca5e839d1bd5e475b2b3a932a4262ecc51b2585e94dede017021b5075b2e36c2687b27a82350064b5cc74fb27761987cff55e8637f # 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.3/Joomla_4.4.3-Stable-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.4/Joomla_4.4.4-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/php8.1/fpm/Dockerfile b/4.4/php8.1/fpm/Dockerfile index 75c97b7..8696a27 100644 --- a/4.4/php8.1/fpm/Dockerfile +++ b/4.4/php8.1/fpm/Dockerfile @@ -131,12 +131,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.3 -ENV JOOMLA_SHA512 40be1f6d16430b4d0f7fde1ac2c96245388f28031790757e667b5ab52802105aec1ce51efdaa13576082218e0842c893d884a78f1ef358bec6fa1fb0a2cdabcd +ENV JOOMLA_VERSION 4.4.4 +ENV JOOMLA_SHA512 782469e12a7e6ceb719e4fca5e839d1bd5e475b2b3a932a4262ecc51b2585e94dede017021b5075b2e36c2687b27a82350064b5cc74fb27761987cff55e8637f # 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.3/Joomla_4.4.3-Stable-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.4/Joomla_4.4.4-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/php8.2/apache/Dockerfile b/4.4/php8.2/apache/Dockerfile index 3657fbf..8986b37 100644 --- a/4.4/php8.2/apache/Dockerfile +++ b/4.4/php8.2/apache/Dockerfile @@ -149,12 +149,12 @@ RUN set -eux; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.3 -ENV JOOMLA_SHA512 40be1f6d16430b4d0f7fde1ac2c96245388f28031790757e667b5ab52802105aec1ce51efdaa13576082218e0842c893d884a78f1ef358bec6fa1fb0a2cdabcd +ENV JOOMLA_VERSION 4.4.4 +ENV JOOMLA_SHA512 782469e12a7e6ceb719e4fca5e839d1bd5e475b2b3a932a4262ecc51b2585e94dede017021b5075b2e36c2687b27a82350064b5cc74fb27761987cff55e8637f # 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.3/Joomla_4.4.3-Stable-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.4/Joomla_4.4.4-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/php8.2/fpm-alpine/Dockerfile b/4.4/php8.2/fpm-alpine/Dockerfile index ce375d3..0b5582c 100644 --- a/4.4/php8.2/fpm-alpine/Dockerfile +++ b/4.4/php8.2/fpm-alpine/Dockerfile @@ -129,12 +129,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.3 -ENV JOOMLA_SHA512 40be1f6d16430b4d0f7fde1ac2c96245388f28031790757e667b5ab52802105aec1ce51efdaa13576082218e0842c893d884a78f1ef358bec6fa1fb0a2cdabcd +ENV JOOMLA_VERSION 4.4.4 +ENV JOOMLA_SHA512 782469e12a7e6ceb719e4fca5e839d1bd5e475b2b3a932a4262ecc51b2585e94dede017021b5075b2e36c2687b27a82350064b5cc74fb27761987cff55e8637f # 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.3/Joomla_4.4.3-Stable-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.4/Joomla_4.4.4-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/php8.2/fpm/Dockerfile b/4.4/php8.2/fpm/Dockerfile index 0aeecdb..40ec1b3 100644 --- a/4.4/php8.2/fpm/Dockerfile +++ b/4.4/php8.2/fpm/Dockerfile @@ -131,12 +131,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.4.3 -ENV JOOMLA_SHA512 40be1f6d16430b4d0f7fde1ac2c96245388f28031790757e667b5ab52802105aec1ce51efdaa13576082218e0842c893d884a78f1ef358bec6fa1fb0a2cdabcd +ENV JOOMLA_VERSION 4.4.4 +ENV JOOMLA_SHA512 782469e12a7e6ceb719e4fca5e839d1bd5e475b2b3a932a4262ecc51b2585e94dede017021b5075b2e36c2687b27a82350064b5cc74fb27761987cff55e8637f # 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.3/Joomla_4.4.3-Stable-Full_Package.tar.bz2; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.4.4/Joomla_4.4.4-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/5.1.beta/php8.1/apache/Dockerfile b/5.1.beta/php8.1/apache/Dockerfile deleted file mode 100644 index 2d587fa..0000000 --- a/5.1.beta/php8.1/apache/Dockerfile +++ /dev/null @@ -1,173 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# from https://downloads.joomla.org/technical-requirements -FROM php:8.1-apache -LABEL maintainer="Llewellyn van der Merwe (@Llewellynvdm), Harald Leithner (@HLeithner)" - -# Disable remote database security requirements. -ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 -RUN set -eux; \ - apt-get update; \ - 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/* - -# install the PHP extensions we need. -RUN set -ex; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libbz2-dev \ - libgmp-dev \ - libicu-dev \ - libfreetype6-dev \ - libjpeg-dev \ - libldap2-dev \ - libmemcached-dev \ - libmagickwand-dev \ - libpq-dev \ - libpng-dev \ - libwebp-dev \ - libzip-dev \ - ; \ - \ - docker-php-ext-configure gd \ - --with-freetype \ - --with-jpeg \ - --with-webp \ - ; \ - debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ - docker-php-ext-install -j "$(nproc)" \ - bz2 \ - bcmath \ - exif \ - gd \ - gmp \ - intl \ - ldap \ - mysqli \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - zip \ - ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.7.0; \ - docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ - \ -# some misbehaving extensions end up outputting to stdout - out="$(php -r 'exit(0);')"; \ - [ -z "$out" ]; \ - err="$(php -r 'exit(0);' 3>&1 1>&2 2>&3)"; \ - [ -z "$err" ]; \ - \ - extDir="$(php -r 'echo ini_get("extension_dir");')"; \ - [ -d "$extDir" ]; \ -# pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ - pecl install memcached-3.2.0; \ - pecl install redis-6.0.2; \ - \ - docker-php-ext-enable \ - apcu \ - memcached \ - redis \ - ; \ - rm -r /tmp/pear; \ - \ -# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark; \ - ldd "$extDir"/*.so \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -rt apt-mark manual; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ - \ - ! { ldd "$extDir"/*.so | grep 'not found'; }; \ -# check for output like "PHP Warning: PHP Startup: Unable to load dynamic library 'foo' (tried: ...) - err="$(php --version 3>&1 1>&2 2>&3)"; \ - [ -z "$err" ] - -# set recommended PHP.ini settings -# see https://secure.php.net/manual/en/opcache.installation.php -RUN set -eux; \ - docker-php-ext-enable opcache; \ - { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=2'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# set recommended error logging -RUN { \ -# https://www.php.net/manual/en/errorfunc.constants.php - echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \ - echo 'display_errors = Off'; \ - echo 'display_startup_errors = Off'; \ - echo 'log_errors = On'; \ - echo 'error_log = /dev/stderr'; \ - echo 'log_errors_max_len = 1024'; \ - echo 'ignore_repeated_errors = On'; \ - echo 'ignore_repeated_source = Off'; \ - echo 'html_errors = Off'; \ - } > /usr/local/etc/php/conf.d/error-logging.ini - -RUN set -eux; \ - a2enmod rewrite expires; \ - \ -# https://httpd.apache.org/docs/2.4/mod/mod_remoteip.html - a2enmod remoteip; \ - { \ - echo 'RemoteIPHeader X-Forwarded-For'; \ -# these IP ranges are reserved for "private" use and should thus *usually* be safe inside Docker - 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) - find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' + - -VOLUME /var/www/html - -# Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.1.0-beta2 -ENV JOOMLA_SHA512 8f4f81c9147270c6f7a2373c96716c90272f12e7c8679166517eb84990e3c7724b1d3657c3f8eee1a46094a4d950830048afdd17dae516be8dac5fd7be1cba65 - -# 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.1.0-beta2/Joomla_5.1.0-beta2-Beta-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; \ - rm joomla.tar.zst; \ - chown -R www-data:www-data /usr/src/joomla - -# Copy init scripts -COPY docker-entrypoint.sh /entrypoint.sh -COPY makedb.php /makedb.php - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["apache2-foreground"] - - diff --git a/5.1.beta/php8.1/apache/docker-entrypoint.sh b/5.1.beta/php8.1/apache/docker-entrypoint.sh deleted file mode 100755 index 06d22d3..0000000 --- a/5.1.beta/php8.1/apache/docker-entrypoint.sh +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/bash -set -e - -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then - uid="$(id -u)" - gid="$(id -g)" - if [ "$uid" = '0' ]; then - case "$1" in - apache2*) - user="${APACHE_RUN_USER:-www-data}" - group="${APACHE_RUN_GROUP:-www-data}" - - # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" - - # set user if not exist - if ! id "$user" &>/dev/null; then - # get the user name - : "${USER_NAME:=www-data}" - # change the user name - [[ "$USER_NAME" != "www-data" ]] && - usermod -l "$USER_NAME" www-data && - groupmod -n "$USER_NAME" www-data - # update the user ID - groupmod -o -g "$user" "$USER_NAME" - # update the user-group ID - usermod -o -u "$group" "$USER_NAME" - fi - ;; - *) # php-fpm - user='www-data' - group='www-data' - ;; - esac - else - user="$uid" - group="$gid" - fi - - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - echo >&2 "warning: both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - echo >&2 " Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - echo >&2 " instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - echo >&2 "error: missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables" - echo >&2 " Did you forget to --link some_mysql_container:mysql or set an external db" - echo >&2 " with -e JOOMLA_DB_HOST=hostname:port?" - exit 1 - fi - - # If the DB user is 'root' then use the MySQL root password env var - : "${JOOMLA_DB_USER:=root}" - if [ "$JOOMLA_DB_USER" = 'root' ]; then - : ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD} - fi - : "${JOOMLA_DB_NAME:=joomla}" - - if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then - echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable" - echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - echo >&2 - echo >&2 " (Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - exit 1 - fi - - if [ ! -e index.php ] && [ ! -e libraries/src/Version.php ]; then - # if the directory exists and Joomla doesn't appear to be installed AND the permissions of it are root:root, let's chown it (likely a Docker-created directory) - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' .)" = '0:0' ]; then - chown "$user:$group" . - fi - - echo >&2 "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" - ( - set -x - ls -A - sleep 10 - ) - fi - # use full commands - # for clearer intent - sourceTarArgs=( - --create - --file - - --directory /usr/src/joomla - --one-file-system - --owner "$user" --group "$group" - ) - targetTarArgs=( - --extract - --file - - ) - if [ "$uid" != '0' ]; then - # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=(--no-overwrite-dir) - fi - - tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}" - - if [ ! -e .htaccess ]; then - # NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess - sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt >.htaccess - chown "$user":"$group" .htaccess - fi - - echo >&2 "Complete! Joomla has been successfully copied to $PWD" - fi - - # Ensure the MySQL Database is created - php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - - # Basic email regex for validation - email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Function to validate environment variables - validate_vars() { - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_USER is longer than 2 characters - if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then - echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical - if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then - echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" - return 1 - fi - - # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters - if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then - echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_EMAIL is a valid email - if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then - echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - # If all checks passed, return 0 - return 0 - } - - # Function to check that auto deploy can be done - can_auto_deploy() { - # Check if all NEEDED variables exist - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - # All variables exist. Now validate them. - if validate_vars; then - # If all checks passed, return 0 - return 0 - fi - fi - - # If any needed variables does not exist fail, return 1 - return 1 - } - - # if the directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then - # use full commands - # for clearer intent - installJoomlaArgs=( - --site-name="${JOOMLA_SITE_NAME}" - --admin-email="${JOOMLA_ADMIN_EMAIL}" - --admin-username="${JOOMLA_ADMIN_USERNAME}" - --admin-user="${JOOMLA_ADMIN_USER}" - --admin-password="${JOOMLA_ADMIN_PASSWORD}" - --db-type="${JOOMLA_DB_TYPE:-mysqli}" - --db-host="${JOOMLA_DB_HOST}" - --db-name="${JOOMLA_DB_NAME}" - --db-pass="${JOOMLA_DB_PASSWORD}" - --db-user="${JOOMLA_DB_USER}" - --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" - --db-encryption=0 - ) - - # Run the auto deploy (install) - if php installation/joomla.php install "${installJoomlaArgs[@]}"; then - - # The PHP command succeeded (so we remove the installation folder) - rm -rf installation - - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set configuration to correct owner - if ! chown "$user:$group" configuration.php; then - echo >&2 - echo >&2 "Error: Ownership of configuration.php failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - echo >&2 - echo >&2 "Error: Permissions of configuration.php failed to be corrected." - fi - fi - - echo >&2 - echo >&2 "========================================================================" - else - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" - fi - else - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" - fi -fi - -exec "$@" diff --git a/5.1.beta/php8.1/apache/makedb.php b/5.1.beta/php8.1/apache/makedb.php deleted file mode 100644 index f6db25e..0000000 --- a/5.1.beta/php8.1/apache/makedb.php +++ /dev/null @@ -1,102 +0,0 @@ - makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME", 5 => "$JOOMLA_DB_TYPE" -$stderr = fopen('php://stderr', 'w'); -fwrite($stderr, "\nEnsuring Joomla database is present\n"); - -if (strpos($argv[1], ':') !== false) -{ - list($host, $port) = explode(':', $argv[1], 2); -} -else -{ - $host = $argv[1]; - $port = null; -} - -$user = $argv[2]; -$password = $argv[3]; -$db = $argv[4]; -$dbType = strtolower($argv[5]); - -if ($dbType === 'mysqli') -{ - $port = $port ? (int)$port : 3306; - $maxTries = 10; - - // set original default behaviour for PHP 8.1 and higher - // see https://www.php.net/manual/en/mysqli-driver.report-mode.php - mysqli_report(MYSQLI_REPORT_OFF); - do { - $mysql = new mysqli($host, $user, $password, '', $port); - - if ($mysql->connect_error) - { - fwrite($stderr, "\nMySQL Connection Error: ({$mysql->connect_errno}) {$mysql->connect_error}\n"); - --$maxTries; - - if ($maxTries <= 0) - { - exit(1); - } - - sleep(3); - } - } while ($mysql->connect_error); - - if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($db) . '`')) - { - fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n"); - $mysql->close(); - exit(1); - } - - fwrite($stderr, "\nMySQL Database Created\n"); - - $mysql->close(); -} -elseif ($dbType === 'pgsql') -{ - $port = $port ? (int)$port : 5432; - $maxTries = 10; - - do { - $connection = "host={$host} port={$port} user={$user} password={$password}"; - $dbconn = @pg_connect($connection); - - if (!$dbconn) - { - fwrite($stderr, "\nPostgreSQL Connection Error\n"); - --$maxTries; - - if ($maxTries <= 0) - { - exit(1); - } - - sleep(3); - } - } while (!$dbconn); - - $query = "SELECT 1 FROM pg_database WHERE datname = '$db'"; - $result = pg_query($dbconn, $query); - - if (pg_num_rows($result) == 0) - { - $createDbQuery = "CREATE DATABASE \"$db\""; - if (!pg_query($dbconn, $createDbQuery)) - { - fwrite($stderr, "\nPostgreSQL 'CREATE DATABASE' Error\n"); - pg_close($dbconn); - exit(1); - } - } - - fwrite($stderr, "\nPostgreSQL Database Created\n"); - - pg_close($dbconn); -} -else -{ - fwrite($stderr, "\nInvalid database type. Please provide 'pgsql' or 'mysqli'.\n"); - exit(1); -} diff --git a/5.1.beta/php8.1/fpm-alpine/Dockerfile b/5.1.beta/php8.1/fpm-alpine/Dockerfile deleted file mode 100644 index 6b8035a..0000000 --- a/5.1.beta/php8.1/fpm-alpine/Dockerfile +++ /dev/null @@ -1,154 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# from https://downloads.joomla.org/technical-requirements -FROM php:8.1-fpm-alpine -LABEL maintainer="Llewellyn van der Merwe (@Llewellynvdm), Harald Leithner (@HLeithner)" - -# Disable remote database security requirements. -ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 -RUN set -eux; \ - apk add --no-cache \ -# in theory, docker-entrypoint.sh is POSIX-compliant, but priority is a working, consistent image - bash \ -# Ghostscript is required for rendering PDF previews - ghostscript \ -# Alpine package for "imagemagick" contains ~120 .so files - imagemagick \ -# Needed for the zst joomla package - zstd \ - ; - -# install the PHP extensions we need. -RUN set -ex; \ - \ - apk add --no-cache --virtual .build-deps \ - $PHPIZE_DEPS \ - autoconf \ - bzip2-dev \ - gmp-dev \ - icu-dev \ - freetype-dev \ - imagemagick-dev \ - libjpeg-turbo-dev \ - libmemcached-dev \ - libpng-dev \ - libwebp-dev \ - libzip-dev \ - openldap-dev \ - pcre-dev \ - postgresql-dev \ - ; \ - \ - docker-php-ext-configure gd \ - --with-freetype \ - --with-jpeg \ - --with-webp \ - ; \ - docker-php-ext-configure ldap; \ - docker-php-ext-install -j "$(nproc)" \ - bz2 \ - bcmath \ - exif \ - gd \ - gmp \ - intl \ - ldap \ - mysqli \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - zip \ - ; \ -# WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.7.0; \ - docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ - \ -# some misbehaving extensions end up outputting to stdout - out="$(php -r 'exit(0);')"; \ - [ -z "$out" ]; \ - err="$(php -r 'exit(0);' 3>&1 1>&2 2>&3)"; \ - [ -z "$err" ]; \ - \ - extDir="$(php -r 'echo ini_get("extension_dir");')"; \ - [ -d "$extDir" ]; \ - \ -# pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ - pecl install memcached-3.2.0; \ - pecl install redis-6.0.2; \ - \ - docker-php-ext-enable \ - apcu \ - memcached \ - redis \ - ; \ - rm -r /tmp/pear; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive "$extDir" \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .joomla-phpexts-rundeps $runDeps; \ - apk del --no-network .build-deps; \ - \ - ! { ldd "$extDir"/*.so | grep 'not found'; }; \ -# check for output like "PHP Warning: PHP Startup: Unable to load dynamic library 'foo' (tried: ...) - err="$(php --version 3>&1 1>&2 2>&3)"; \ - [ -z "$err" ] - -# set recommended PHP.ini settings -# see https://secure.php.net/manual/en/opcache.installation.php -RUN set -eux; \ - docker-php-ext-enable opcache; \ - { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=2'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# set recommended error logging -RUN { \ -# https://www.php.net/manual/en/errorfunc.constants.php - echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \ - echo 'display_errors = Off'; \ - echo 'display_startup_errors = Off'; \ - echo 'log_errors = On'; \ - echo 'error_log = /dev/stderr'; \ - echo 'log_errors_max_len = 1024'; \ - echo 'ignore_repeated_errors = On'; \ - echo 'ignore_repeated_source = Off'; \ - echo 'html_errors = Off'; \ - } > /usr/local/etc/php/conf.d/error-logging.ini - -VOLUME /var/www/html - -# Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.1.0-beta2 -ENV JOOMLA_SHA512 8f4f81c9147270c6f7a2373c96716c90272f12e7c8679166517eb84990e3c7724b1d3657c3f8eee1a46094a4d950830048afdd17dae516be8dac5fd7be1cba65 - -# 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.1.0-beta2/Joomla_5.1.0-beta2-Beta-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; \ - rm joomla.tar.zst; \ - chown -R www-data:www-data /usr/src/joomla - -# Copy init scripts -COPY docker-entrypoint.sh /entrypoint.sh -COPY makedb.php /makedb.php - -ENTRYPOINT ["/entrypoint.sh"] - -CMD ["php-fpm"] - - diff --git a/5.1.beta/php8.1/fpm-alpine/docker-entrypoint.sh b/5.1.beta/php8.1/fpm-alpine/docker-entrypoint.sh deleted file mode 100755 index 06d22d3..0000000 --- a/5.1.beta/php8.1/fpm-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/bash -set -e - -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then - uid="$(id -u)" - gid="$(id -g)" - if [ "$uid" = '0' ]; then - case "$1" in - apache2*) - user="${APACHE_RUN_USER:-www-data}" - group="${APACHE_RUN_GROUP:-www-data}" - - # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" - - # set user if not exist - if ! id "$user" &>/dev/null; then - # get the user name - : "${USER_NAME:=www-data}" - # change the user name - [[ "$USER_NAME" != "www-data" ]] && - usermod -l "$USER_NAME" www-data && - groupmod -n "$USER_NAME" www-data - # update the user ID - groupmod -o -g "$user" "$USER_NAME" - # update the user-group ID - usermod -o -u "$group" "$USER_NAME" - fi - ;; - *) # php-fpm - user='www-data' - group='www-data' - ;; - esac - else - user="$uid" - group="$gid" - fi - - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - echo >&2 "warning: both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - echo >&2 " Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - echo >&2 " instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - echo >&2 "error: missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables" - echo >&2 " Did you forget to --link some_mysql_container:mysql or set an external db" - echo >&2 " with -e JOOMLA_DB_HOST=hostname:port?" - exit 1 - fi - - # If the DB user is 'root' then use the MySQL root password env var - : "${JOOMLA_DB_USER:=root}" - if [ "$JOOMLA_DB_USER" = 'root' ]; then - : ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD} - fi - : "${JOOMLA_DB_NAME:=joomla}" - - if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then - echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable" - echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - echo >&2 - echo >&2 " (Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - exit 1 - fi - - if [ ! -e index.php ] && [ ! -e libraries/src/Version.php ]; then - # if the directory exists and Joomla doesn't appear to be installed AND the permissions of it are root:root, let's chown it (likely a Docker-created directory) - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' .)" = '0:0' ]; then - chown "$user:$group" . - fi - - echo >&2 "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" - ( - set -x - ls -A - sleep 10 - ) - fi - # use full commands - # for clearer intent - sourceTarArgs=( - --create - --file - - --directory /usr/src/joomla - --one-file-system - --owner "$user" --group "$group" - ) - targetTarArgs=( - --extract - --file - - ) - if [ "$uid" != '0' ]; then - # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=(--no-overwrite-dir) - fi - - tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}" - - if [ ! -e .htaccess ]; then - # NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess - sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt >.htaccess - chown "$user":"$group" .htaccess - fi - - echo >&2 "Complete! Joomla has been successfully copied to $PWD" - fi - - # Ensure the MySQL Database is created - php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - - # Basic email regex for validation - email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Function to validate environment variables - validate_vars() { - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_USER is longer than 2 characters - if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then - echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical - if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then - echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" - return 1 - fi - - # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters - if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then - echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_EMAIL is a valid email - if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then - echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - # If all checks passed, return 0 - return 0 - } - - # Function to check that auto deploy can be done - can_auto_deploy() { - # Check if all NEEDED variables exist - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - # All variables exist. Now validate them. - if validate_vars; then - # If all checks passed, return 0 - return 0 - fi - fi - - # If any needed variables does not exist fail, return 1 - return 1 - } - - # if the directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then - # use full commands - # for clearer intent - installJoomlaArgs=( - --site-name="${JOOMLA_SITE_NAME}" - --admin-email="${JOOMLA_ADMIN_EMAIL}" - --admin-username="${JOOMLA_ADMIN_USERNAME}" - --admin-user="${JOOMLA_ADMIN_USER}" - --admin-password="${JOOMLA_ADMIN_PASSWORD}" - --db-type="${JOOMLA_DB_TYPE:-mysqli}" - --db-host="${JOOMLA_DB_HOST}" - --db-name="${JOOMLA_DB_NAME}" - --db-pass="${JOOMLA_DB_PASSWORD}" - --db-user="${JOOMLA_DB_USER}" - --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" - --db-encryption=0 - ) - - # Run the auto deploy (install) - if php installation/joomla.php install "${installJoomlaArgs[@]}"; then - - # The PHP command succeeded (so we remove the installation folder) - rm -rf installation - - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set configuration to correct owner - if ! chown "$user:$group" configuration.php; then - echo >&2 - echo >&2 "Error: Ownership of configuration.php failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - echo >&2 - echo >&2 "Error: Permissions of configuration.php failed to be corrected." - fi - fi - - echo >&2 - echo >&2 "========================================================================" - else - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" - fi - else - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" - fi -fi - -exec "$@" diff --git a/5.1.beta/php8.1/fpm-alpine/makedb.php b/5.1.beta/php8.1/fpm-alpine/makedb.php deleted file mode 100644 index f6db25e..0000000 --- a/5.1.beta/php8.1/fpm-alpine/makedb.php +++ /dev/null @@ -1,102 +0,0 @@ - makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME", 5 => "$JOOMLA_DB_TYPE" -$stderr = fopen('php://stderr', 'w'); -fwrite($stderr, "\nEnsuring Joomla database is present\n"); - -if (strpos($argv[1], ':') !== false) -{ - list($host, $port) = explode(':', $argv[1], 2); -} -else -{ - $host = $argv[1]; - $port = null; -} - -$user = $argv[2]; -$password = $argv[3]; -$db = $argv[4]; -$dbType = strtolower($argv[5]); - -if ($dbType === 'mysqli') -{ - $port = $port ? (int)$port : 3306; - $maxTries = 10; - - // set original default behaviour for PHP 8.1 and higher - // see https://www.php.net/manual/en/mysqli-driver.report-mode.php - mysqli_report(MYSQLI_REPORT_OFF); - do { - $mysql = new mysqli($host, $user, $password, '', $port); - - if ($mysql->connect_error) - { - fwrite($stderr, "\nMySQL Connection Error: ({$mysql->connect_errno}) {$mysql->connect_error}\n"); - --$maxTries; - - if ($maxTries <= 0) - { - exit(1); - } - - sleep(3); - } - } while ($mysql->connect_error); - - if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($db) . '`')) - { - fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n"); - $mysql->close(); - exit(1); - } - - fwrite($stderr, "\nMySQL Database Created\n"); - - $mysql->close(); -} -elseif ($dbType === 'pgsql') -{ - $port = $port ? (int)$port : 5432; - $maxTries = 10; - - do { - $connection = "host={$host} port={$port} user={$user} password={$password}"; - $dbconn = @pg_connect($connection); - - if (!$dbconn) - { - fwrite($stderr, "\nPostgreSQL Connection Error\n"); - --$maxTries; - - if ($maxTries <= 0) - { - exit(1); - } - - sleep(3); - } - } while (!$dbconn); - - $query = "SELECT 1 FROM pg_database WHERE datname = '$db'"; - $result = pg_query($dbconn, $query); - - if (pg_num_rows($result) == 0) - { - $createDbQuery = "CREATE DATABASE \"$db\""; - if (!pg_query($dbconn, $createDbQuery)) - { - fwrite($stderr, "\nPostgreSQL 'CREATE DATABASE' Error\n"); - pg_close($dbconn); - exit(1); - } - } - - fwrite($stderr, "\nPostgreSQL Database Created\n"); - - pg_close($dbconn); -} -else -{ - fwrite($stderr, "\nInvalid database type. Please provide 'pgsql' or 'mysqli'.\n"); - exit(1); -} diff --git a/5.1.beta/php8.1/fpm/Dockerfile b/5.1.beta/php8.1/fpm/Dockerfile deleted file mode 100644 index 8491138..0000000 --- a/5.1.beta/php8.1/fpm/Dockerfile +++ /dev/null @@ -1,156 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# from https://downloads.joomla.org/technical-requirements -FROM php:8.1-fpm -LABEL maintainer="Llewellyn van der Merwe (@Llewellynvdm), Harald Leithner (@HLeithner)" - -# Disable remote database security requirements. -ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 -RUN set -eux; \ - apt-get update; \ - 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/* - -# install the PHP extensions we need. -RUN set -ex; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libbz2-dev \ - libgmp-dev \ - libicu-dev \ - libfreetype6-dev \ - libjpeg-dev \ - libldap2-dev \ - libmemcached-dev \ - libmagickwand-dev \ - libpq-dev \ - libpng-dev \ - libwebp-dev \ - libzip-dev \ - ; \ - \ - docker-php-ext-configure gd \ - --with-freetype \ - --with-jpeg \ - --with-webp \ - ; \ - debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ - docker-php-ext-install -j "$(nproc)" \ - bz2 \ - bcmath \ - exif \ - gd \ - gmp \ - intl \ - ldap \ - mysqli \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - zip \ - ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.7.0; \ - docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ - \ -# some misbehaving extensions end up outputting to stdout - out="$(php -r 'exit(0);')"; \ - [ -z "$out" ]; \ - err="$(php -r 'exit(0);' 3>&1 1>&2 2>&3)"; \ - [ -z "$err" ]; \ - \ - extDir="$(php -r 'echo ini_get("extension_dir");')"; \ - [ -d "$extDir" ]; \ -# pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ - pecl install memcached-3.2.0; \ - pecl install redis-6.0.2; \ - \ - docker-php-ext-enable \ - apcu \ - memcached \ - redis \ - ; \ - rm -r /tmp/pear; \ - \ -# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark; \ - ldd "$extDir"/*.so \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -rt apt-mark manual; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ - \ - ! { ldd "$extDir"/*.so | grep 'not found'; }; \ -# check for output like "PHP Warning: PHP Startup: Unable to load dynamic library 'foo' (tried: ...) - err="$(php --version 3>&1 1>&2 2>&3)"; \ - [ -z "$err" ] - -# set recommended PHP.ini settings -# see https://secure.php.net/manual/en/opcache.installation.php -RUN set -eux; \ - docker-php-ext-enable opcache; \ - { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=2'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# set recommended error logging -RUN { \ -# https://www.php.net/manual/en/errorfunc.constants.php - echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \ - echo 'display_errors = Off'; \ - echo 'display_startup_errors = Off'; \ - echo 'log_errors = On'; \ - echo 'error_log = /dev/stderr'; \ - echo 'log_errors_max_len = 1024'; \ - echo 'ignore_repeated_errors = On'; \ - echo 'ignore_repeated_source = Off'; \ - echo 'html_errors = Off'; \ - } > /usr/local/etc/php/conf.d/error-logging.ini - -VOLUME /var/www/html - -# Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.1.0-beta2 -ENV JOOMLA_SHA512 8f4f81c9147270c6f7a2373c96716c90272f12e7c8679166517eb84990e3c7724b1d3657c3f8eee1a46094a4d950830048afdd17dae516be8dac5fd7be1cba65 - -# 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.1.0-beta2/Joomla_5.1.0-beta2-Beta-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; \ - rm joomla.tar.zst; \ - chown -R www-data:www-data /usr/src/joomla - -# Copy init scripts -COPY docker-entrypoint.sh /entrypoint.sh -COPY makedb.php /makedb.php - -ENTRYPOINT ["/entrypoint.sh"] - -CMD ["php-fpm"] - - diff --git a/5.1.beta/php8.1/fpm/docker-entrypoint.sh b/5.1.beta/php8.1/fpm/docker-entrypoint.sh deleted file mode 100755 index 06d22d3..0000000 --- a/5.1.beta/php8.1/fpm/docker-entrypoint.sh +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/bash -set -e - -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then - uid="$(id -u)" - gid="$(id -g)" - if [ "$uid" = '0' ]; then - case "$1" in - apache2*) - user="${APACHE_RUN_USER:-www-data}" - group="${APACHE_RUN_GROUP:-www-data}" - - # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" - - # set user if not exist - if ! id "$user" &>/dev/null; then - # get the user name - : "${USER_NAME:=www-data}" - # change the user name - [[ "$USER_NAME" != "www-data" ]] && - usermod -l "$USER_NAME" www-data && - groupmod -n "$USER_NAME" www-data - # update the user ID - groupmod -o -g "$user" "$USER_NAME" - # update the user-group ID - usermod -o -u "$group" "$USER_NAME" - fi - ;; - *) # php-fpm - user='www-data' - group='www-data' - ;; - esac - else - user="$uid" - group="$gid" - fi - - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - echo >&2 "warning: both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - echo >&2 " Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - echo >&2 " instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - echo >&2 "error: missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables" - echo >&2 " Did you forget to --link some_mysql_container:mysql or set an external db" - echo >&2 " with -e JOOMLA_DB_HOST=hostname:port?" - exit 1 - fi - - # If the DB user is 'root' then use the MySQL root password env var - : "${JOOMLA_DB_USER:=root}" - if [ "$JOOMLA_DB_USER" = 'root' ]; then - : ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD} - fi - : "${JOOMLA_DB_NAME:=joomla}" - - if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then - echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable" - echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - echo >&2 - echo >&2 " (Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - exit 1 - fi - - if [ ! -e index.php ] && [ ! -e libraries/src/Version.php ]; then - # if the directory exists and Joomla doesn't appear to be installed AND the permissions of it are root:root, let's chown it (likely a Docker-created directory) - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' .)" = '0:0' ]; then - chown "$user:$group" . - fi - - echo >&2 "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" - ( - set -x - ls -A - sleep 10 - ) - fi - # use full commands - # for clearer intent - sourceTarArgs=( - --create - --file - - --directory /usr/src/joomla - --one-file-system - --owner "$user" --group "$group" - ) - targetTarArgs=( - --extract - --file - - ) - if [ "$uid" != '0' ]; then - # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=(--no-overwrite-dir) - fi - - tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}" - - if [ ! -e .htaccess ]; then - # NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess - sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt >.htaccess - chown "$user":"$group" .htaccess - fi - - echo >&2 "Complete! Joomla has been successfully copied to $PWD" - fi - - # Ensure the MySQL Database is created - php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - - # Basic email regex for validation - email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Function to validate environment variables - validate_vars() { - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_USER is longer than 2 characters - if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then - echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical - if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then - echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" - return 1 - fi - - # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters - if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then - echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_EMAIL is a valid email - if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then - echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - # If all checks passed, return 0 - return 0 - } - - # Function to check that auto deploy can be done - can_auto_deploy() { - # Check if all NEEDED variables exist - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - # All variables exist. Now validate them. - if validate_vars; then - # If all checks passed, return 0 - return 0 - fi - fi - - # If any needed variables does not exist fail, return 1 - return 1 - } - - # if the directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then - # use full commands - # for clearer intent - installJoomlaArgs=( - --site-name="${JOOMLA_SITE_NAME}" - --admin-email="${JOOMLA_ADMIN_EMAIL}" - --admin-username="${JOOMLA_ADMIN_USERNAME}" - --admin-user="${JOOMLA_ADMIN_USER}" - --admin-password="${JOOMLA_ADMIN_PASSWORD}" - --db-type="${JOOMLA_DB_TYPE:-mysqli}" - --db-host="${JOOMLA_DB_HOST}" - --db-name="${JOOMLA_DB_NAME}" - --db-pass="${JOOMLA_DB_PASSWORD}" - --db-user="${JOOMLA_DB_USER}" - --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" - --db-encryption=0 - ) - - # Run the auto deploy (install) - if php installation/joomla.php install "${installJoomlaArgs[@]}"; then - - # The PHP command succeeded (so we remove the installation folder) - rm -rf installation - - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set configuration to correct owner - if ! chown "$user:$group" configuration.php; then - echo >&2 - echo >&2 "Error: Ownership of configuration.php failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - echo >&2 - echo >&2 "Error: Permissions of configuration.php failed to be corrected." - fi - fi - - echo >&2 - echo >&2 "========================================================================" - else - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" - fi - else - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" - fi -fi - -exec "$@" diff --git a/5.1.beta/php8.1/fpm/makedb.php b/5.1.beta/php8.1/fpm/makedb.php deleted file mode 100644 index f6db25e..0000000 --- a/5.1.beta/php8.1/fpm/makedb.php +++ /dev/null @@ -1,102 +0,0 @@ - makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME", 5 => "$JOOMLA_DB_TYPE" -$stderr = fopen('php://stderr', 'w'); -fwrite($stderr, "\nEnsuring Joomla database is present\n"); - -if (strpos($argv[1], ':') !== false) -{ - list($host, $port) = explode(':', $argv[1], 2); -} -else -{ - $host = $argv[1]; - $port = null; -} - -$user = $argv[2]; -$password = $argv[3]; -$db = $argv[4]; -$dbType = strtolower($argv[5]); - -if ($dbType === 'mysqli') -{ - $port = $port ? (int)$port : 3306; - $maxTries = 10; - - // set original default behaviour for PHP 8.1 and higher - // see https://www.php.net/manual/en/mysqli-driver.report-mode.php - mysqli_report(MYSQLI_REPORT_OFF); - do { - $mysql = new mysqli($host, $user, $password, '', $port); - - if ($mysql->connect_error) - { - fwrite($stderr, "\nMySQL Connection Error: ({$mysql->connect_errno}) {$mysql->connect_error}\n"); - --$maxTries; - - if ($maxTries <= 0) - { - exit(1); - } - - sleep(3); - } - } while ($mysql->connect_error); - - if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($db) . '`')) - { - fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n"); - $mysql->close(); - exit(1); - } - - fwrite($stderr, "\nMySQL Database Created\n"); - - $mysql->close(); -} -elseif ($dbType === 'pgsql') -{ - $port = $port ? (int)$port : 5432; - $maxTries = 10; - - do { - $connection = "host={$host} port={$port} user={$user} password={$password}"; - $dbconn = @pg_connect($connection); - - if (!$dbconn) - { - fwrite($stderr, "\nPostgreSQL Connection Error\n"); - --$maxTries; - - if ($maxTries <= 0) - { - exit(1); - } - - sleep(3); - } - } while (!$dbconn); - - $query = "SELECT 1 FROM pg_database WHERE datname = '$db'"; - $result = pg_query($dbconn, $query); - - if (pg_num_rows($result) == 0) - { - $createDbQuery = "CREATE DATABASE \"$db\""; - if (!pg_query($dbconn, $createDbQuery)) - { - fwrite($stderr, "\nPostgreSQL 'CREATE DATABASE' Error\n"); - pg_close($dbconn); - exit(1); - } - } - - fwrite($stderr, "\nPostgreSQL Database Created\n"); - - pg_close($dbconn); -} -else -{ - fwrite($stderr, "\nInvalid database type. Please provide 'pgsql' or 'mysqli'.\n"); - exit(1); -} diff --git a/5.1.beta/php8.2/apache/Dockerfile b/5.1.beta/php8.2/apache/Dockerfile deleted file mode 100644 index 187a05f..0000000 --- a/5.1.beta/php8.2/apache/Dockerfile +++ /dev/null @@ -1,173 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# from https://downloads.joomla.org/technical-requirements -FROM php:8.2-apache -LABEL maintainer="Llewellyn van der Merwe (@Llewellynvdm), Harald Leithner (@HLeithner)" - -# Disable remote database security requirements. -ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 -RUN set -eux; \ - apt-get update; \ - 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/* - -# install the PHP extensions we need. -RUN set -ex; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libbz2-dev \ - libgmp-dev \ - libicu-dev \ - libfreetype6-dev \ - libjpeg-dev \ - libldap2-dev \ - libmemcached-dev \ - libmagickwand-dev \ - libpq-dev \ - libpng-dev \ - libwebp-dev \ - libzip-dev \ - ; \ - \ - docker-php-ext-configure gd \ - --with-freetype \ - --with-jpeg \ - --with-webp \ - ; \ - debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ - docker-php-ext-install -j "$(nproc)" \ - bz2 \ - bcmath \ - exif \ - gd \ - gmp \ - intl \ - ldap \ - mysqli \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - zip \ - ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.7.0; \ - docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ - \ -# some misbehaving extensions end up outputting to stdout - out="$(php -r 'exit(0);')"; \ - [ -z "$out" ]; \ - err="$(php -r 'exit(0);' 3>&1 1>&2 2>&3)"; \ - [ -z "$err" ]; \ - \ - extDir="$(php -r 'echo ini_get("extension_dir");')"; \ - [ -d "$extDir" ]; \ -# pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ - pecl install memcached-3.2.0; \ - pecl install redis-6.0.2; \ - \ - docker-php-ext-enable \ - apcu \ - memcached \ - redis \ - ; \ - rm -r /tmp/pear; \ - \ -# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark; \ - ldd "$extDir"/*.so \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -rt apt-mark manual; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ - \ - ! { ldd "$extDir"/*.so | grep 'not found'; }; \ -# check for output like "PHP Warning: PHP Startup: Unable to load dynamic library 'foo' (tried: ...) - err="$(php --version 3>&1 1>&2 2>&3)"; \ - [ -z "$err" ] - -# set recommended PHP.ini settings -# see https://secure.php.net/manual/en/opcache.installation.php -RUN set -eux; \ - docker-php-ext-enable opcache; \ - { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=2'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# set recommended error logging -RUN { \ -# https://www.php.net/manual/en/errorfunc.constants.php - echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \ - echo 'display_errors = Off'; \ - echo 'display_startup_errors = Off'; \ - echo 'log_errors = On'; \ - echo 'error_log = /dev/stderr'; \ - echo 'log_errors_max_len = 1024'; \ - echo 'ignore_repeated_errors = On'; \ - echo 'ignore_repeated_source = Off'; \ - echo 'html_errors = Off'; \ - } > /usr/local/etc/php/conf.d/error-logging.ini - -RUN set -eux; \ - a2enmod rewrite expires; \ - \ -# https://httpd.apache.org/docs/2.4/mod/mod_remoteip.html - a2enmod remoteip; \ - { \ - echo 'RemoteIPHeader X-Forwarded-For'; \ -# these IP ranges are reserved for "private" use and should thus *usually* be safe inside Docker - 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) - find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' + - -VOLUME /var/www/html - -# Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.1.0-beta2 -ENV JOOMLA_SHA512 8f4f81c9147270c6f7a2373c96716c90272f12e7c8679166517eb84990e3c7724b1d3657c3f8eee1a46094a4d950830048afdd17dae516be8dac5fd7be1cba65 - -# 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.1.0-beta2/Joomla_5.1.0-beta2-Beta-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; \ - rm joomla.tar.zst; \ - chown -R www-data:www-data /usr/src/joomla - -# Copy init scripts -COPY docker-entrypoint.sh /entrypoint.sh -COPY makedb.php /makedb.php - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["apache2-foreground"] - - diff --git a/5.1.beta/php8.2/apache/docker-entrypoint.sh b/5.1.beta/php8.2/apache/docker-entrypoint.sh deleted file mode 100755 index 06d22d3..0000000 --- a/5.1.beta/php8.2/apache/docker-entrypoint.sh +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/bash -set -e - -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then - uid="$(id -u)" - gid="$(id -g)" - if [ "$uid" = '0' ]; then - case "$1" in - apache2*) - user="${APACHE_RUN_USER:-www-data}" - group="${APACHE_RUN_GROUP:-www-data}" - - # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" - - # set user if not exist - if ! id "$user" &>/dev/null; then - # get the user name - : "${USER_NAME:=www-data}" - # change the user name - [[ "$USER_NAME" != "www-data" ]] && - usermod -l "$USER_NAME" www-data && - groupmod -n "$USER_NAME" www-data - # update the user ID - groupmod -o -g "$user" "$USER_NAME" - # update the user-group ID - usermod -o -u "$group" "$USER_NAME" - fi - ;; - *) # php-fpm - user='www-data' - group='www-data' - ;; - esac - else - user="$uid" - group="$gid" - fi - - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - echo >&2 "warning: both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - echo >&2 " Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - echo >&2 " instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - echo >&2 "error: missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables" - echo >&2 " Did you forget to --link some_mysql_container:mysql or set an external db" - echo >&2 " with -e JOOMLA_DB_HOST=hostname:port?" - exit 1 - fi - - # If the DB user is 'root' then use the MySQL root password env var - : "${JOOMLA_DB_USER:=root}" - if [ "$JOOMLA_DB_USER" = 'root' ]; then - : ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD} - fi - : "${JOOMLA_DB_NAME:=joomla}" - - if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then - echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable" - echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - echo >&2 - echo >&2 " (Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - exit 1 - fi - - if [ ! -e index.php ] && [ ! -e libraries/src/Version.php ]; then - # if the directory exists and Joomla doesn't appear to be installed AND the permissions of it are root:root, let's chown it (likely a Docker-created directory) - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' .)" = '0:0' ]; then - chown "$user:$group" . - fi - - echo >&2 "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" - ( - set -x - ls -A - sleep 10 - ) - fi - # use full commands - # for clearer intent - sourceTarArgs=( - --create - --file - - --directory /usr/src/joomla - --one-file-system - --owner "$user" --group "$group" - ) - targetTarArgs=( - --extract - --file - - ) - if [ "$uid" != '0' ]; then - # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=(--no-overwrite-dir) - fi - - tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}" - - if [ ! -e .htaccess ]; then - # NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess - sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt >.htaccess - chown "$user":"$group" .htaccess - fi - - echo >&2 "Complete! Joomla has been successfully copied to $PWD" - fi - - # Ensure the MySQL Database is created - php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - - # Basic email regex for validation - email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Function to validate environment variables - validate_vars() { - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_USER is longer than 2 characters - if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then - echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical - if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then - echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" - return 1 - fi - - # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters - if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then - echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_EMAIL is a valid email - if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then - echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - # If all checks passed, return 0 - return 0 - } - - # Function to check that auto deploy can be done - can_auto_deploy() { - # Check if all NEEDED variables exist - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - # All variables exist. Now validate them. - if validate_vars; then - # If all checks passed, return 0 - return 0 - fi - fi - - # If any needed variables does not exist fail, return 1 - return 1 - } - - # if the directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then - # use full commands - # for clearer intent - installJoomlaArgs=( - --site-name="${JOOMLA_SITE_NAME}" - --admin-email="${JOOMLA_ADMIN_EMAIL}" - --admin-username="${JOOMLA_ADMIN_USERNAME}" - --admin-user="${JOOMLA_ADMIN_USER}" - --admin-password="${JOOMLA_ADMIN_PASSWORD}" - --db-type="${JOOMLA_DB_TYPE:-mysqli}" - --db-host="${JOOMLA_DB_HOST}" - --db-name="${JOOMLA_DB_NAME}" - --db-pass="${JOOMLA_DB_PASSWORD}" - --db-user="${JOOMLA_DB_USER}" - --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" - --db-encryption=0 - ) - - # Run the auto deploy (install) - if php installation/joomla.php install "${installJoomlaArgs[@]}"; then - - # The PHP command succeeded (so we remove the installation folder) - rm -rf installation - - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set configuration to correct owner - if ! chown "$user:$group" configuration.php; then - echo >&2 - echo >&2 "Error: Ownership of configuration.php failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - echo >&2 - echo >&2 "Error: Permissions of configuration.php failed to be corrected." - fi - fi - - echo >&2 - echo >&2 "========================================================================" - else - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" - fi - else - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" - fi -fi - -exec "$@" diff --git a/5.1.beta/php8.2/apache/makedb.php b/5.1.beta/php8.2/apache/makedb.php deleted file mode 100644 index f6db25e..0000000 --- a/5.1.beta/php8.2/apache/makedb.php +++ /dev/null @@ -1,102 +0,0 @@ - makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME", 5 => "$JOOMLA_DB_TYPE" -$stderr = fopen('php://stderr', 'w'); -fwrite($stderr, "\nEnsuring Joomla database is present\n"); - -if (strpos($argv[1], ':') !== false) -{ - list($host, $port) = explode(':', $argv[1], 2); -} -else -{ - $host = $argv[1]; - $port = null; -} - -$user = $argv[2]; -$password = $argv[3]; -$db = $argv[4]; -$dbType = strtolower($argv[5]); - -if ($dbType === 'mysqli') -{ - $port = $port ? (int)$port : 3306; - $maxTries = 10; - - // set original default behaviour for PHP 8.1 and higher - // see https://www.php.net/manual/en/mysqli-driver.report-mode.php - mysqli_report(MYSQLI_REPORT_OFF); - do { - $mysql = new mysqli($host, $user, $password, '', $port); - - if ($mysql->connect_error) - { - fwrite($stderr, "\nMySQL Connection Error: ({$mysql->connect_errno}) {$mysql->connect_error}\n"); - --$maxTries; - - if ($maxTries <= 0) - { - exit(1); - } - - sleep(3); - } - } while ($mysql->connect_error); - - if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($db) . '`')) - { - fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n"); - $mysql->close(); - exit(1); - } - - fwrite($stderr, "\nMySQL Database Created\n"); - - $mysql->close(); -} -elseif ($dbType === 'pgsql') -{ - $port = $port ? (int)$port : 5432; - $maxTries = 10; - - do { - $connection = "host={$host} port={$port} user={$user} password={$password}"; - $dbconn = @pg_connect($connection); - - if (!$dbconn) - { - fwrite($stderr, "\nPostgreSQL Connection Error\n"); - --$maxTries; - - if ($maxTries <= 0) - { - exit(1); - } - - sleep(3); - } - } while (!$dbconn); - - $query = "SELECT 1 FROM pg_database WHERE datname = '$db'"; - $result = pg_query($dbconn, $query); - - if (pg_num_rows($result) == 0) - { - $createDbQuery = "CREATE DATABASE \"$db\""; - if (!pg_query($dbconn, $createDbQuery)) - { - fwrite($stderr, "\nPostgreSQL 'CREATE DATABASE' Error\n"); - pg_close($dbconn); - exit(1); - } - } - - fwrite($stderr, "\nPostgreSQL Database Created\n"); - - pg_close($dbconn); -} -else -{ - fwrite($stderr, "\nInvalid database type. Please provide 'pgsql' or 'mysqli'.\n"); - exit(1); -} diff --git a/5.1.beta/php8.2/fpm-alpine/Dockerfile b/5.1.beta/php8.2/fpm-alpine/Dockerfile deleted file mode 100644 index 59d3a53..0000000 --- a/5.1.beta/php8.2/fpm-alpine/Dockerfile +++ /dev/null @@ -1,154 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# from https://downloads.joomla.org/technical-requirements -FROM php:8.2-fpm-alpine -LABEL maintainer="Llewellyn van der Merwe (@Llewellynvdm), Harald Leithner (@HLeithner)" - -# Disable remote database security requirements. -ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 -RUN set -eux; \ - apk add --no-cache \ -# in theory, docker-entrypoint.sh is POSIX-compliant, but priority is a working, consistent image - bash \ -# Ghostscript is required for rendering PDF previews - ghostscript \ -# Alpine package for "imagemagick" contains ~120 .so files - imagemagick \ -# Needed for the zst joomla package - zstd \ - ; - -# install the PHP extensions we need. -RUN set -ex; \ - \ - apk add --no-cache --virtual .build-deps \ - $PHPIZE_DEPS \ - autoconf \ - bzip2-dev \ - gmp-dev \ - icu-dev \ - freetype-dev \ - imagemagick-dev \ - libjpeg-turbo-dev \ - libmemcached-dev \ - libpng-dev \ - libwebp-dev \ - libzip-dev \ - openldap-dev \ - pcre-dev \ - postgresql-dev \ - ; \ - \ - docker-php-ext-configure gd \ - --with-freetype \ - --with-jpeg \ - --with-webp \ - ; \ - docker-php-ext-configure ldap; \ - docker-php-ext-install -j "$(nproc)" \ - bz2 \ - bcmath \ - exif \ - gd \ - gmp \ - intl \ - ldap \ - mysqli \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - zip \ - ; \ -# WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.7.0; \ - docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ - \ -# some misbehaving extensions end up outputting to stdout - out="$(php -r 'exit(0);')"; \ - [ -z "$out" ]; \ - err="$(php -r 'exit(0);' 3>&1 1>&2 2>&3)"; \ - [ -z "$err" ]; \ - \ - extDir="$(php -r 'echo ini_get("extension_dir");')"; \ - [ -d "$extDir" ]; \ - \ -# pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ - pecl install memcached-3.2.0; \ - pecl install redis-6.0.2; \ - \ - docker-php-ext-enable \ - apcu \ - memcached \ - redis \ - ; \ - rm -r /tmp/pear; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive "$extDir" \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .joomla-phpexts-rundeps $runDeps; \ - apk del --no-network .build-deps; \ - \ - ! { ldd "$extDir"/*.so | grep 'not found'; }; \ -# check for output like "PHP Warning: PHP Startup: Unable to load dynamic library 'foo' (tried: ...) - err="$(php --version 3>&1 1>&2 2>&3)"; \ - [ -z "$err" ] - -# set recommended PHP.ini settings -# see https://secure.php.net/manual/en/opcache.installation.php -RUN set -eux; \ - docker-php-ext-enable opcache; \ - { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=2'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# set recommended error logging -RUN { \ -# https://www.php.net/manual/en/errorfunc.constants.php - echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \ - echo 'display_errors = Off'; \ - echo 'display_startup_errors = Off'; \ - echo 'log_errors = On'; \ - echo 'error_log = /dev/stderr'; \ - echo 'log_errors_max_len = 1024'; \ - echo 'ignore_repeated_errors = On'; \ - echo 'ignore_repeated_source = Off'; \ - echo 'html_errors = Off'; \ - } > /usr/local/etc/php/conf.d/error-logging.ini - -VOLUME /var/www/html - -# Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.1.0-beta2 -ENV JOOMLA_SHA512 8f4f81c9147270c6f7a2373c96716c90272f12e7c8679166517eb84990e3c7724b1d3657c3f8eee1a46094a4d950830048afdd17dae516be8dac5fd7be1cba65 - -# 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.1.0-beta2/Joomla_5.1.0-beta2-Beta-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; \ - rm joomla.tar.zst; \ - chown -R www-data:www-data /usr/src/joomla - -# Copy init scripts -COPY docker-entrypoint.sh /entrypoint.sh -COPY makedb.php /makedb.php - -ENTRYPOINT ["/entrypoint.sh"] - -CMD ["php-fpm"] - - diff --git a/5.1.beta/php8.2/fpm-alpine/docker-entrypoint.sh b/5.1.beta/php8.2/fpm-alpine/docker-entrypoint.sh deleted file mode 100755 index 06d22d3..0000000 --- a/5.1.beta/php8.2/fpm-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/bash -set -e - -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then - uid="$(id -u)" - gid="$(id -g)" - if [ "$uid" = '0' ]; then - case "$1" in - apache2*) - user="${APACHE_RUN_USER:-www-data}" - group="${APACHE_RUN_GROUP:-www-data}" - - # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" - - # set user if not exist - if ! id "$user" &>/dev/null; then - # get the user name - : "${USER_NAME:=www-data}" - # change the user name - [[ "$USER_NAME" != "www-data" ]] && - usermod -l "$USER_NAME" www-data && - groupmod -n "$USER_NAME" www-data - # update the user ID - groupmod -o -g "$user" "$USER_NAME" - # update the user-group ID - usermod -o -u "$group" "$USER_NAME" - fi - ;; - *) # php-fpm - user='www-data' - group='www-data' - ;; - esac - else - user="$uid" - group="$gid" - fi - - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - echo >&2 "warning: both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - echo >&2 " Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - echo >&2 " instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - echo >&2 "error: missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables" - echo >&2 " Did you forget to --link some_mysql_container:mysql or set an external db" - echo >&2 " with -e JOOMLA_DB_HOST=hostname:port?" - exit 1 - fi - - # If the DB user is 'root' then use the MySQL root password env var - : "${JOOMLA_DB_USER:=root}" - if [ "$JOOMLA_DB_USER" = 'root' ]; then - : ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD} - fi - : "${JOOMLA_DB_NAME:=joomla}" - - if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then - echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable" - echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - echo >&2 - echo >&2 " (Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - exit 1 - fi - - if [ ! -e index.php ] && [ ! -e libraries/src/Version.php ]; then - # if the directory exists and Joomla doesn't appear to be installed AND the permissions of it are root:root, let's chown it (likely a Docker-created directory) - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' .)" = '0:0' ]; then - chown "$user:$group" . - fi - - echo >&2 "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" - ( - set -x - ls -A - sleep 10 - ) - fi - # use full commands - # for clearer intent - sourceTarArgs=( - --create - --file - - --directory /usr/src/joomla - --one-file-system - --owner "$user" --group "$group" - ) - targetTarArgs=( - --extract - --file - - ) - if [ "$uid" != '0' ]; then - # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=(--no-overwrite-dir) - fi - - tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}" - - if [ ! -e .htaccess ]; then - # NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess - sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt >.htaccess - chown "$user":"$group" .htaccess - fi - - echo >&2 "Complete! Joomla has been successfully copied to $PWD" - fi - - # Ensure the MySQL Database is created - php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - - # Basic email regex for validation - email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Function to validate environment variables - validate_vars() { - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_USER is longer than 2 characters - if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then - echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical - if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then - echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" - return 1 - fi - - # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters - if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then - echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_EMAIL is a valid email - if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then - echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - # If all checks passed, return 0 - return 0 - } - - # Function to check that auto deploy can be done - can_auto_deploy() { - # Check if all NEEDED variables exist - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - # All variables exist. Now validate them. - if validate_vars; then - # If all checks passed, return 0 - return 0 - fi - fi - - # If any needed variables does not exist fail, return 1 - return 1 - } - - # if the directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then - # use full commands - # for clearer intent - installJoomlaArgs=( - --site-name="${JOOMLA_SITE_NAME}" - --admin-email="${JOOMLA_ADMIN_EMAIL}" - --admin-username="${JOOMLA_ADMIN_USERNAME}" - --admin-user="${JOOMLA_ADMIN_USER}" - --admin-password="${JOOMLA_ADMIN_PASSWORD}" - --db-type="${JOOMLA_DB_TYPE:-mysqli}" - --db-host="${JOOMLA_DB_HOST}" - --db-name="${JOOMLA_DB_NAME}" - --db-pass="${JOOMLA_DB_PASSWORD}" - --db-user="${JOOMLA_DB_USER}" - --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" - --db-encryption=0 - ) - - # Run the auto deploy (install) - if php installation/joomla.php install "${installJoomlaArgs[@]}"; then - - # The PHP command succeeded (so we remove the installation folder) - rm -rf installation - - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set configuration to correct owner - if ! chown "$user:$group" configuration.php; then - echo >&2 - echo >&2 "Error: Ownership of configuration.php failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - echo >&2 - echo >&2 "Error: Permissions of configuration.php failed to be corrected." - fi - fi - - echo >&2 - echo >&2 "========================================================================" - else - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" - fi - else - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" - fi -fi - -exec "$@" diff --git a/5.1.beta/php8.2/fpm-alpine/makedb.php b/5.1.beta/php8.2/fpm-alpine/makedb.php deleted file mode 100644 index f6db25e..0000000 --- a/5.1.beta/php8.2/fpm-alpine/makedb.php +++ /dev/null @@ -1,102 +0,0 @@ - makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME", 5 => "$JOOMLA_DB_TYPE" -$stderr = fopen('php://stderr', 'w'); -fwrite($stderr, "\nEnsuring Joomla database is present\n"); - -if (strpos($argv[1], ':') !== false) -{ - list($host, $port) = explode(':', $argv[1], 2); -} -else -{ - $host = $argv[1]; - $port = null; -} - -$user = $argv[2]; -$password = $argv[3]; -$db = $argv[4]; -$dbType = strtolower($argv[5]); - -if ($dbType === 'mysqli') -{ - $port = $port ? (int)$port : 3306; - $maxTries = 10; - - // set original default behaviour for PHP 8.1 and higher - // see https://www.php.net/manual/en/mysqli-driver.report-mode.php - mysqli_report(MYSQLI_REPORT_OFF); - do { - $mysql = new mysqli($host, $user, $password, '', $port); - - if ($mysql->connect_error) - { - fwrite($stderr, "\nMySQL Connection Error: ({$mysql->connect_errno}) {$mysql->connect_error}\n"); - --$maxTries; - - if ($maxTries <= 0) - { - exit(1); - } - - sleep(3); - } - } while ($mysql->connect_error); - - if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($db) . '`')) - { - fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n"); - $mysql->close(); - exit(1); - } - - fwrite($stderr, "\nMySQL Database Created\n"); - - $mysql->close(); -} -elseif ($dbType === 'pgsql') -{ - $port = $port ? (int)$port : 5432; - $maxTries = 10; - - do { - $connection = "host={$host} port={$port} user={$user} password={$password}"; - $dbconn = @pg_connect($connection); - - if (!$dbconn) - { - fwrite($stderr, "\nPostgreSQL Connection Error\n"); - --$maxTries; - - if ($maxTries <= 0) - { - exit(1); - } - - sleep(3); - } - } while (!$dbconn); - - $query = "SELECT 1 FROM pg_database WHERE datname = '$db'"; - $result = pg_query($dbconn, $query); - - if (pg_num_rows($result) == 0) - { - $createDbQuery = "CREATE DATABASE \"$db\""; - if (!pg_query($dbconn, $createDbQuery)) - { - fwrite($stderr, "\nPostgreSQL 'CREATE DATABASE' Error\n"); - pg_close($dbconn); - exit(1); - } - } - - fwrite($stderr, "\nPostgreSQL Database Created\n"); - - pg_close($dbconn); -} -else -{ - fwrite($stderr, "\nInvalid database type. Please provide 'pgsql' or 'mysqli'.\n"); - exit(1); -} diff --git a/5.1.beta/php8.2/fpm/Dockerfile b/5.1.beta/php8.2/fpm/Dockerfile deleted file mode 100644 index 3bfc8b4..0000000 --- a/5.1.beta/php8.2/fpm/Dockerfile +++ /dev/null @@ -1,156 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -# from https://downloads.joomla.org/technical-requirements -FROM php:8.2-fpm -LABEL maintainer="Llewellyn van der Merwe (@Llewellynvdm), Harald Leithner (@HLeithner)" - -# Disable remote database security requirements. -ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1 -RUN set -eux; \ - apt-get update; \ - 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/* - -# install the PHP extensions we need. -RUN set -ex; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libbz2-dev \ - libgmp-dev \ - libicu-dev \ - libfreetype6-dev \ - libjpeg-dev \ - libldap2-dev \ - libmemcached-dev \ - libmagickwand-dev \ - libpq-dev \ - libpng-dev \ - libwebp-dev \ - libzip-dev \ - ; \ - \ - docker-php-ext-configure gd \ - --with-freetype \ - --with-jpeg \ - --with-webp \ - ; \ - debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ - docker-php-ext-install -j "$(nproc)" \ - bz2 \ - bcmath \ - exif \ - gd \ - gmp \ - intl \ - ldap \ - mysqli \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - zip \ - ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.7.0; \ - docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ - \ -# some misbehaving extensions end up outputting to stdout - out="$(php -r 'exit(0);')"; \ - [ -z "$out" ]; \ - err="$(php -r 'exit(0);' 3>&1 1>&2 2>&3)"; \ - [ -z "$err" ]; \ - \ - extDir="$(php -r 'echo ini_get("extension_dir");')"; \ - [ -d "$extDir" ]; \ -# pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ - pecl install memcached-3.2.0; \ - pecl install redis-6.0.2; \ - \ - docker-php-ext-enable \ - apcu \ - memcached \ - redis \ - ; \ - rm -r /tmp/pear; \ - \ -# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark; \ - ldd "$extDir"/*.so \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -rt apt-mark manual; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ - \ - ! { ldd "$extDir"/*.so | grep 'not found'; }; \ -# check for output like "PHP Warning: PHP Startup: Unable to load dynamic library 'foo' (tried: ...) - err="$(php --version 3>&1 1>&2 2>&3)"; \ - [ -z "$err" ] - -# set recommended PHP.ini settings -# see https://secure.php.net/manual/en/opcache.installation.php -RUN set -eux; \ - docker-php-ext-enable opcache; \ - { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=2'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini -# set recommended error logging -RUN { \ -# https://www.php.net/manual/en/errorfunc.constants.php - echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \ - echo 'display_errors = Off'; \ - echo 'display_startup_errors = Off'; \ - echo 'log_errors = On'; \ - echo 'error_log = /dev/stderr'; \ - echo 'log_errors_max_len = 1024'; \ - echo 'ignore_repeated_errors = On'; \ - echo 'ignore_repeated_source = Off'; \ - echo 'html_errors = Off'; \ - } > /usr/local/etc/php/conf.d/error-logging.ini - -VOLUME /var/www/html - -# Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.1.0-beta2 -ENV JOOMLA_SHA512 8f4f81c9147270c6f7a2373c96716c90272f12e7c8679166517eb84990e3c7724b1d3657c3f8eee1a46094a4d950830048afdd17dae516be8dac5fd7be1cba65 - -# 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.1.0-beta2/Joomla_5.1.0-beta2-Beta-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; \ - rm joomla.tar.zst; \ - chown -R www-data:www-data /usr/src/joomla - -# Copy init scripts -COPY docker-entrypoint.sh /entrypoint.sh -COPY makedb.php /makedb.php - -ENTRYPOINT ["/entrypoint.sh"] - -CMD ["php-fpm"] - - diff --git a/5.1.beta/php8.2/fpm/docker-entrypoint.sh b/5.1.beta/php8.2/fpm/docker-entrypoint.sh deleted file mode 100755 index 06d22d3..0000000 --- a/5.1.beta/php8.2/fpm/docker-entrypoint.sh +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/bash -set -e - -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then - uid="$(id -u)" - gid="$(id -g)" - if [ "$uid" = '0' ]; then - case "$1" in - apache2*) - user="${APACHE_RUN_USER:-www-data}" - group="${APACHE_RUN_GROUP:-www-data}" - - # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" - - # set user if not exist - if ! id "$user" &>/dev/null; then - # get the user name - : "${USER_NAME:=www-data}" - # change the user name - [[ "$USER_NAME" != "www-data" ]] && - usermod -l "$USER_NAME" www-data && - groupmod -n "$USER_NAME" www-data - # update the user ID - groupmod -o -g "$user" "$USER_NAME" - # update the user-group ID - usermod -o -u "$group" "$USER_NAME" - fi - ;; - *) # php-fpm - user='www-data' - group='www-data' - ;; - esac - else - user="$uid" - group="$gid" - fi - - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - echo >&2 "warning: both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - echo >&2 " Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - echo >&2 " instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - echo >&2 "error: missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables" - echo >&2 " Did you forget to --link some_mysql_container:mysql or set an external db" - echo >&2 " with -e JOOMLA_DB_HOST=hostname:port?" - exit 1 - fi - - # If the DB user is 'root' then use the MySQL root password env var - : "${JOOMLA_DB_USER:=root}" - if [ "$JOOMLA_DB_USER" = 'root' ]; then - : ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD} - fi - : "${JOOMLA_DB_NAME:=joomla}" - - if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then - echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable" - echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - echo >&2 - echo >&2 " (Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - exit 1 - fi - - if [ ! -e index.php ] && [ ! -e libraries/src/Version.php ]; then - # if the directory exists and Joomla doesn't appear to be installed AND the permissions of it are root:root, let's chown it (likely a Docker-created directory) - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' .)" = '0:0' ]; then - chown "$user:$group" . - fi - - echo >&2 "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" - ( - set -x - ls -A - sleep 10 - ) - fi - # use full commands - # for clearer intent - sourceTarArgs=( - --create - --file - - --directory /usr/src/joomla - --one-file-system - --owner "$user" --group "$group" - ) - targetTarArgs=( - --extract - --file - - ) - if [ "$uid" != '0' ]; then - # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" - targetTarArgs+=(--no-overwrite-dir) - fi - - tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}" - - if [ ! -e .htaccess ]; then - # NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess - sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt >.htaccess - chown "$user":"$group" .htaccess - fi - - echo >&2 "Complete! Joomla has been successfully copied to $PWD" - fi - - # Ensure the MySQL Database is created - php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - - # Basic email regex for validation - email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Function to validate environment variables - validate_vars() { - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_USER is longer than 2 characters - if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then - echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical - if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then - echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" - return 1 - fi - - # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters - if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then - echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" - return 1 - fi - - # Check if JOOMLA_ADMIN_EMAIL is a valid email - if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then - echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - # If all checks passed, return 0 - return 0 - } - - # Function to check that auto deploy can be done - can_auto_deploy() { - # Check if all NEEDED variables exist - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - # All variables exist. Now validate them. - if validate_vars; then - # If all checks passed, return 0 - return 0 - fi - fi - - # If any needed variables does not exist fail, return 1 - return 1 - } - - # if the directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then - # use full commands - # for clearer intent - installJoomlaArgs=( - --site-name="${JOOMLA_SITE_NAME}" - --admin-email="${JOOMLA_ADMIN_EMAIL}" - --admin-username="${JOOMLA_ADMIN_USERNAME}" - --admin-user="${JOOMLA_ADMIN_USER}" - --admin-password="${JOOMLA_ADMIN_PASSWORD}" - --db-type="${JOOMLA_DB_TYPE:-mysqli}" - --db-host="${JOOMLA_DB_HOST}" - --db-name="${JOOMLA_DB_NAME}" - --db-pass="${JOOMLA_DB_PASSWORD}" - --db-user="${JOOMLA_DB_USER}" - --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" - --db-encryption=0 - ) - - # Run the auto deploy (install) - if php installation/joomla.php install "${installJoomlaArgs[@]}"; then - - # The PHP command succeeded (so we remove the installation folder) - rm -rf installation - - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set configuration to correct owner - if ! chown "$user:$group" configuration.php; then - echo >&2 - echo >&2 "Error: Ownership of configuration.php failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - echo >&2 - echo >&2 "Error: Permissions of configuration.php failed to be corrected." - fi - fi - - echo >&2 - echo >&2 "========================================================================" - else - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" - fi - else - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" - fi -fi - -exec "$@" diff --git a/5.1.beta/php8.2/fpm/makedb.php b/5.1.beta/php8.2/fpm/makedb.php deleted file mode 100644 index f6db25e..0000000 --- a/5.1.beta/php8.2/fpm/makedb.php +++ /dev/null @@ -1,102 +0,0 @@ - makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME", 5 => "$JOOMLA_DB_TYPE" -$stderr = fopen('php://stderr', 'w'); -fwrite($stderr, "\nEnsuring Joomla database is present\n"); - -if (strpos($argv[1], ':') !== false) -{ - list($host, $port) = explode(':', $argv[1], 2); -} -else -{ - $host = $argv[1]; - $port = null; -} - -$user = $argv[2]; -$password = $argv[3]; -$db = $argv[4]; -$dbType = strtolower($argv[5]); - -if ($dbType === 'mysqli') -{ - $port = $port ? (int)$port : 3306; - $maxTries = 10; - - // set original default behaviour for PHP 8.1 and higher - // see https://www.php.net/manual/en/mysqli-driver.report-mode.php - mysqli_report(MYSQLI_REPORT_OFF); - do { - $mysql = new mysqli($host, $user, $password, '', $port); - - if ($mysql->connect_error) - { - fwrite($stderr, "\nMySQL Connection Error: ({$mysql->connect_errno}) {$mysql->connect_error}\n"); - --$maxTries; - - if ($maxTries <= 0) - { - exit(1); - } - - sleep(3); - } - } while ($mysql->connect_error); - - if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($db) . '`')) - { - fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n"); - $mysql->close(); - exit(1); - } - - fwrite($stderr, "\nMySQL Database Created\n"); - - $mysql->close(); -} -elseif ($dbType === 'pgsql') -{ - $port = $port ? (int)$port : 5432; - $maxTries = 10; - - do { - $connection = "host={$host} port={$port} user={$user} password={$password}"; - $dbconn = @pg_connect($connection); - - if (!$dbconn) - { - fwrite($stderr, "\nPostgreSQL Connection Error\n"); - --$maxTries; - - if ($maxTries <= 0) - { - exit(1); - } - - sleep(3); - } - } while (!$dbconn); - - $query = "SELECT 1 FROM pg_database WHERE datname = '$db'"; - $result = pg_query($dbconn, $query); - - if (pg_num_rows($result) == 0) - { - $createDbQuery = "CREATE DATABASE \"$db\""; - if (!pg_query($dbconn, $createDbQuery)) - { - fwrite($stderr, "\nPostgreSQL 'CREATE DATABASE' Error\n"); - pg_close($dbconn); - exit(1); - } - } - - fwrite($stderr, "\nPostgreSQL Database Created\n"); - - pg_close($dbconn); -} -else -{ - fwrite($stderr, "\nInvalid database type. Please provide 'pgsql' or 'mysqli'.\n"); - exit(1); -} diff --git a/5.0/php8.1/apache/Dockerfile b/5.1/php8.1/apache/Dockerfile similarity index 95% rename from 5.0/php8.1/apache/Dockerfile rename to 5.1/php8.1/apache/Dockerfile index d5220df..1eb1c00 100644 --- a/5.0/php8.1/apache/Dockerfile +++ b/5.1/php8.1/apache/Dockerfile @@ -151,12 +151,12 @@ RUN set -eux; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.0.3 -ENV JOOMLA_SHA512 5fa4a0fdae08f8ea71216337b02f4f8dcf75b8d001fc82c0987041844cc263e78ca8244a0fbbc4a3e53055c8e09a1533464d90ea118ebd79b2b1b972807c532e +ENV JOOMLA_VERSION 5.1.0 +ENV JOOMLA_SHA512 3d5e547520ddbbbd256dccaf9c88911d3571bb0698f6857a0472f174fa1d62b71ee24442c16c20528c70dc5d4b97bf946182146497d32faecf6f8897ff72485c # 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.3/Joomla_5.0.3-Stable-Full_Package.tar.zst; \ + curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0/Joomla_5.1.0-Stable-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/5.0/php8.1/apache/docker-entrypoint.sh b/5.1/php8.1/apache/docker-entrypoint.sh similarity index 100% rename from 5.0/php8.1/apache/docker-entrypoint.sh rename to 5.1/php8.1/apache/docker-entrypoint.sh diff --git a/5.0/php8.1/apache/makedb.php b/5.1/php8.1/apache/makedb.php similarity index 100% rename from 5.0/php8.1/apache/makedb.php rename to 5.1/php8.1/apache/makedb.php diff --git a/5.0/php8.1/fpm-alpine/Dockerfile b/5.1/php8.1/fpm-alpine/Dockerfile similarity index 94% rename from 5.0/php8.1/fpm-alpine/Dockerfile rename to 5.1/php8.1/fpm-alpine/Dockerfile index 9b4de78..03e70d4 100644 --- a/5.0/php8.1/fpm-alpine/Dockerfile +++ b/5.1/php8.1/fpm-alpine/Dockerfile @@ -131,12 +131,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.0.3 -ENV JOOMLA_SHA512 5fa4a0fdae08f8ea71216337b02f4f8dcf75b8d001fc82c0987041844cc263e78ca8244a0fbbc4a3e53055c8e09a1533464d90ea118ebd79b2b1b972807c532e +ENV JOOMLA_VERSION 5.1.0 +ENV JOOMLA_SHA512 3d5e547520ddbbbd256dccaf9c88911d3571bb0698f6857a0472f174fa1d62b71ee24442c16c20528c70dc5d4b97bf946182146497d32faecf6f8897ff72485c # 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.3/Joomla_5.0.3-Stable-Full_Package.tar.zst; \ + curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0/Joomla_5.1.0-Stable-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/5.0/php8.1/fpm-alpine/docker-entrypoint.sh b/5.1/php8.1/fpm-alpine/docker-entrypoint.sh similarity index 100% rename from 5.0/php8.1/fpm-alpine/docker-entrypoint.sh rename to 5.1/php8.1/fpm-alpine/docker-entrypoint.sh diff --git a/5.0/php8.1/fpm-alpine/makedb.php b/5.1/php8.1/fpm-alpine/makedb.php similarity index 100% rename from 5.0/php8.1/fpm-alpine/makedb.php rename to 5.1/php8.1/fpm-alpine/makedb.php diff --git a/5.0/php8.1/fpm/Dockerfile b/5.1/php8.1/fpm/Dockerfile similarity index 94% rename from 5.0/php8.1/fpm/Dockerfile rename to 5.1/php8.1/fpm/Dockerfile index e406d4e..08ebed2 100644 --- a/5.0/php8.1/fpm/Dockerfile +++ b/5.1/php8.1/fpm/Dockerfile @@ -133,12 +133,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.0.3 -ENV JOOMLA_SHA512 5fa4a0fdae08f8ea71216337b02f4f8dcf75b8d001fc82c0987041844cc263e78ca8244a0fbbc4a3e53055c8e09a1533464d90ea118ebd79b2b1b972807c532e +ENV JOOMLA_VERSION 5.1.0 +ENV JOOMLA_SHA512 3d5e547520ddbbbd256dccaf9c88911d3571bb0698f6857a0472f174fa1d62b71ee24442c16c20528c70dc5d4b97bf946182146497d32faecf6f8897ff72485c # 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.3/Joomla_5.0.3-Stable-Full_Package.tar.zst; \ + curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0/Joomla_5.1.0-Stable-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/5.0/php8.1/fpm/docker-entrypoint.sh b/5.1/php8.1/fpm/docker-entrypoint.sh similarity index 100% rename from 5.0/php8.1/fpm/docker-entrypoint.sh rename to 5.1/php8.1/fpm/docker-entrypoint.sh diff --git a/5.0/php8.1/fpm/makedb.php b/5.1/php8.1/fpm/makedb.php similarity index 100% rename from 5.0/php8.1/fpm/makedb.php rename to 5.1/php8.1/fpm/makedb.php diff --git a/5.0/php8.2/apache/Dockerfile b/5.1/php8.2/apache/Dockerfile similarity index 95% rename from 5.0/php8.2/apache/Dockerfile rename to 5.1/php8.2/apache/Dockerfile index b991265..01f5868 100644 --- a/5.0/php8.2/apache/Dockerfile +++ b/5.1/php8.2/apache/Dockerfile @@ -151,12 +151,12 @@ RUN set -eux; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.0.3 -ENV JOOMLA_SHA512 5fa4a0fdae08f8ea71216337b02f4f8dcf75b8d001fc82c0987041844cc263e78ca8244a0fbbc4a3e53055c8e09a1533464d90ea118ebd79b2b1b972807c532e +ENV JOOMLA_VERSION 5.1.0 +ENV JOOMLA_SHA512 3d5e547520ddbbbd256dccaf9c88911d3571bb0698f6857a0472f174fa1d62b71ee24442c16c20528c70dc5d4b97bf946182146497d32faecf6f8897ff72485c # 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.3/Joomla_5.0.3-Stable-Full_Package.tar.zst; \ + curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0/Joomla_5.1.0-Stable-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/5.0/php8.2/apache/docker-entrypoint.sh b/5.1/php8.2/apache/docker-entrypoint.sh similarity index 100% rename from 5.0/php8.2/apache/docker-entrypoint.sh rename to 5.1/php8.2/apache/docker-entrypoint.sh diff --git a/5.0/php8.2/apache/makedb.php b/5.1/php8.2/apache/makedb.php similarity index 100% rename from 5.0/php8.2/apache/makedb.php rename to 5.1/php8.2/apache/makedb.php diff --git a/5.0/php8.2/fpm-alpine/Dockerfile b/5.1/php8.2/fpm-alpine/Dockerfile similarity index 94% rename from 5.0/php8.2/fpm-alpine/Dockerfile rename to 5.1/php8.2/fpm-alpine/Dockerfile index 0d0675a..0ac3c44 100644 --- a/5.0/php8.2/fpm-alpine/Dockerfile +++ b/5.1/php8.2/fpm-alpine/Dockerfile @@ -131,12 +131,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.0.3 -ENV JOOMLA_SHA512 5fa4a0fdae08f8ea71216337b02f4f8dcf75b8d001fc82c0987041844cc263e78ca8244a0fbbc4a3e53055c8e09a1533464d90ea118ebd79b2b1b972807c532e +ENV JOOMLA_VERSION 5.1.0 +ENV JOOMLA_SHA512 3d5e547520ddbbbd256dccaf9c88911d3571bb0698f6857a0472f174fa1d62b71ee24442c16c20528c70dc5d4b97bf946182146497d32faecf6f8897ff72485c # 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.3/Joomla_5.0.3-Stable-Full_Package.tar.zst; \ + curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0/Joomla_5.1.0-Stable-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/5.0/php8.2/fpm-alpine/docker-entrypoint.sh b/5.1/php8.2/fpm-alpine/docker-entrypoint.sh similarity index 100% rename from 5.0/php8.2/fpm-alpine/docker-entrypoint.sh rename to 5.1/php8.2/fpm-alpine/docker-entrypoint.sh diff --git a/5.0/php8.2/fpm-alpine/makedb.php b/5.1/php8.2/fpm-alpine/makedb.php similarity index 100% rename from 5.0/php8.2/fpm-alpine/makedb.php rename to 5.1/php8.2/fpm-alpine/makedb.php diff --git a/5.0/php8.2/fpm/Dockerfile b/5.1/php8.2/fpm/Dockerfile similarity index 94% rename from 5.0/php8.2/fpm/Dockerfile rename to 5.1/php8.2/fpm/Dockerfile index 40422cd..a793821 100644 --- a/5.0/php8.2/fpm/Dockerfile +++ b/5.1/php8.2/fpm/Dockerfile @@ -133,12 +133,12 @@ RUN { \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 5.0.3 -ENV JOOMLA_SHA512 5fa4a0fdae08f8ea71216337b02f4f8dcf75b8d001fc82c0987041844cc263e78ca8244a0fbbc4a3e53055c8e09a1533464d90ea118ebd79b2b1b972807c532e +ENV JOOMLA_VERSION 5.1.0 +ENV JOOMLA_SHA512 3d5e547520ddbbbd256dccaf9c88911d3571bb0698f6857a0472f174fa1d62b71ee24442c16c20528c70dc5d4b97bf946182146497d32faecf6f8897ff72485c # 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.3/Joomla_5.0.3-Stable-Full_Package.tar.zst; \ + curl -o joomla.tar.zst -SL https://github.com/joomla/joomla-cms/releases/download/5.1.0/Joomla_5.1.0-Stable-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/5.0/php8.2/fpm/docker-entrypoint.sh b/5.1/php8.2/fpm/docker-entrypoint.sh similarity index 100% rename from 5.0/php8.2/fpm/docker-entrypoint.sh rename to 5.1/php8.2/fpm/docker-entrypoint.sh diff --git a/5.0/php8.2/fpm/makedb.php b/5.1/php8.2/fpm/makedb.php similarity index 100% rename from 5.0/php8.2/fpm/makedb.php rename to 5.1/php8.2/fpm/makedb.php diff --git a/versions-helper.json b/versions-helper.json index 893eed3..5a7761a 100644 --- a/versions-helper.json +++ b/versions-helper.json @@ -1,38 +1,9 @@ { - "5.1.beta": { - "version": "5.1.0-beta2", - "package": "https://github.com/joomla/joomla-cms/releases/download/5.1.0-beta2/Joomla_5.1.0-beta2-Beta-Full_Package.tar.zst", + "5.1": { + "version": "5.1.0", "packageType": "tar.zst", "php": "8.2", - "aliases": ["5.1.0-beta"], - "phpVersions": { - "8.2": { - "pecl": { - "APCu": "5.1.23", - "memcached": "3.2.0", - "redis": "6.0.2" - } - }, - "8.1": { - "pecl": { - "APCu": "5.1.23", - "memcached": "3.2.0", - "redis": "6.0.2" - } - } - }, - "variant": "apache", - "variants": [ - "apache", - "fpm-alpine", - "fpm" - ] - }, - "5.0": { - "version": "5.0.3", - "packageType": "tar.zst", - "php": "8.2", - "aliases": [5], + "aliases": [5, "latest"], "phpVersions": { "8.2": { "pecl": { @@ -57,9 +28,9 @@ ] }, "4.4": { - "version": "4.4.3", + "version": "4.4.4", "php": "8.1", - "aliases": [4, "latest"], + "aliases": [4], "phpVersions": { "8.2": { "pecl": { diff --git a/versions.json b/versions.json index 20de632..8a44099 100644 --- a/versions.json +++ b/versions.json @@ -1,63 +1,43 @@ { "4.4": { "aliases": [ - 4, - "latest" + 4 ], - "package": "https://github.com/joomla/joomla-cms/releases/download/4.4.3/Joomla_4.4.3-Stable-Full_Package.tar.bz2", + "package": "https://github.com/joomla/joomla-cms/releases/download/4.4.4/Joomla_4.4.4-Stable-Full_Package.tar.bz2", "packageType": "tar.bz2", "php": "8.1", "phpVersions": [ "8.1", "8.2" ], - "sha512": "40be1f6d16430b4d0f7fde1ac2c96245388f28031790757e667b5ab52802105aec1ce51efdaa13576082218e0842c893d884a78f1ef358bec6fa1fb0a2cdabcd", + "sha512": "782469e12a7e6ceb719e4fca5e839d1bd5e475b2b3a932a4262ecc51b2585e94dede017021b5075b2e36c2687b27a82350064b5cc74fb27761987cff55e8637f", "variant": "apache", "variants": [ "apache", "fpm-alpine", "fpm" ], - "version": "4.4.3" + "version": "4.4.4" }, - "5.0": { + "5.1": { "aliases": [ - 5 + 5, + "latest" ], - "package": "https://github.com/joomla/joomla-cms/releases/download/5.0.3/Joomla_5.0.3-Stable-Full_Package.tar.zst", + "package": "https://github.com/joomla/joomla-cms/releases/download/5.1.0/Joomla_5.1.0-Stable-Full_Package.tar.zst", "packageType": "tar.zst", "php": "8.2", "phpVersions": [ "8.1", "8.2" ], - "sha512": "5fa4a0fdae08f8ea71216337b02f4f8dcf75b8d001fc82c0987041844cc263e78ca8244a0fbbc4a3e53055c8e09a1533464d90ea118ebd79b2b1b972807c532e", + "sha512": "3d5e547520ddbbbd256dccaf9c88911d3571bb0698f6857a0472f174fa1d62b71ee24442c16c20528c70dc5d4b97bf946182146497d32faecf6f8897ff72485c", "variant": "apache", "variants": [ "apache", "fpm-alpine", "fpm" ], - "version": "5.0.3" - }, - "5.1.beta": { - "aliases": [ - "5.1.0-beta" - ], - "package": "https://github.com/joomla/joomla-cms/releases/download/5.1.0-beta2/Joomla_5.1.0-beta2-Beta-Full_Package.tar.zst", - "packageType": "tar.zst", - "php": "8.2", - "phpVersions": [ - "8.1", - "8.2" - ], - "sha512": "8f4f81c9147270c6f7a2373c96716c90272f12e7c8679166517eb84990e3c7724b1d3657c3f8eee1a46094a4d950830048afdd17dae516be8dac5fd7be1cba65", - "variant": "apache", - "variants": [ - "apache", - "fpm-alpine", - "fpm" - ], - "version": "5.1.0-beta2" + "version": "5.1.0" } }