From d1f02139287395a0d5ccc3211cea4c6df184377b Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Tue, 30 May 2023 21:50:41 +0200 Subject: [PATCH] Adds PHP8.2 to Joomla 4.3 Images --- 3.10/php8.0/apache/Dockerfile | 2 +- 3.10/php8.0/fpm-alpine/Dockerfile | 2 +- 3.10/php8.0/fpm/Dockerfile | 2 +- 4.3/php8.2/apache/Dockerfile | 172 +++++++++++++++++++++ 4.3/php8.2/apache/docker-entrypoint.sh | 135 ++++++++++++++++ 4.3/php8.2/apache/makedb.php | 102 ++++++++++++ 4.3/php8.2/fpm-alpine/Dockerfile | 153 ++++++++++++++++++ 4.3/php8.2/fpm-alpine/docker-entrypoint.sh | 135 ++++++++++++++++ 4.3/php8.2/fpm-alpine/makedb.php | 102 ++++++++++++ 4.3/php8.2/fpm/Dockerfile | 155 +++++++++++++++++++ 4.3/php8.2/fpm/docker-entrypoint.sh | 135 ++++++++++++++++ 4.3/php8.2/fpm/makedb.php | 102 ++++++++++++ versions-helper.json | 9 +- versions.json | 3 +- 14 files changed, 1204 insertions(+), 5 deletions(-) create mode 100644 4.3/php8.2/apache/Dockerfile create mode 100755 4.3/php8.2/apache/docker-entrypoint.sh create mode 100644 4.3/php8.2/apache/makedb.php create mode 100644 4.3/php8.2/fpm-alpine/Dockerfile create mode 100755 4.3/php8.2/fpm-alpine/docker-entrypoint.sh create mode 100644 4.3/php8.2/fpm-alpine/makedb.php create mode 100644 4.3/php8.2/fpm/Dockerfile create mode 100755 4.3/php8.2/fpm/docker-entrypoint.sh create mode 100644 4.3/php8.2/fpm/makedb.php diff --git a/3.10/php8.0/apache/Dockerfile b/3.10/php8.0/apache/Dockerfile index 7bd3659..57ec3f4 100644 --- a/3.10/php8.0/apache/Dockerfile +++ b/3.10/php8.0/apache/Dockerfile @@ -73,7 +73,7 @@ RUN set -ex; \ 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.21; \ + pecl install APCu-5.1.22; \ pecl install memcached-3.2.0; \ pecl install redis-5.3.7; \ \ diff --git a/3.10/php8.0/fpm-alpine/Dockerfile b/3.10/php8.0/fpm-alpine/Dockerfile index 2c6a5f4..00c7103 100644 --- a/3.10/php8.0/fpm-alpine/Dockerfile +++ b/3.10/php8.0/fpm-alpine/Dockerfile @@ -76,7 +76,7 @@ RUN set -ex; \ [ -d "$extDir" ]; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.21; \ + pecl install APCu-5.1.22; \ pecl install mcrypt-1.0.4; \ pecl install memcached-3.2.0; \ pecl install redis-5.3.7; \ diff --git a/3.10/php8.0/fpm/Dockerfile b/3.10/php8.0/fpm/Dockerfile index 482ac68..8da502c 100644 --- a/3.10/php8.0/fpm/Dockerfile +++ b/3.10/php8.0/fpm/Dockerfile @@ -73,7 +73,7 @@ RUN set -ex; \ 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.21; \ + pecl install APCu-5.1.22; \ pecl install memcached-3.2.0; \ pecl install redis-5.3.7; \ \ diff --git a/4.3/php8.2/apache/Dockerfile b/4.3/php8.2/apache/Dockerfile new file mode 100644 index 0000000..e2f55ff --- /dev/null +++ b/4.3/php8.2/apache/Dockerfile @@ -0,0 +1,172 @@ +# +# 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 \ + ; \ + 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.6.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.22; \ + pecl install memcached-3.2.0; \ + pecl install redis-5.3.7; \ + \ + 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 '/=>/ { print $3 }' \ + | sort -u \ + | xargs -r dpkg-query -S \ + | 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'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /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 'RemoteIPTrustedProxy 10.0.0.0/8'; \ + echo 'RemoteIPTrustedProxy 172.16.0.0/12'; \ + echo 'RemoteIPTrustedProxy 192.168.0.0/16'; \ + echo 'RemoteIPTrustedProxy 169.254.0.0/16'; \ + echo 'RemoteIPTrustedProxy 127.0.0.0/8'; \ + } > /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 4.3.2 +ENV JOOMLA_SHA512 b04eaaf4409a9647eaef6fa4ae98123b019e57b67ca717e941dd546d8ef453cdab87c6b95ea3028b8bde6c0e47b5732ba5efd99d278f6a8b8309980f5719bc90 + +# Download package and extract to web volume +RUN set -ex; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.2/Joomla_4.3.2-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; \ + rm joomla.tar.bz2; \ + 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/4.3/php8.2/apache/docker-entrypoint.sh b/4.3/php8.2/apache/docker-entrypoint.sh new file mode 100755 index 0000000..080a2ac --- /dev/null +++ b/4.3/php8.2/apache/docker-entrypoint.sh @@ -0,0 +1,135 @@ +#!/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}" + + 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 + +exec "$@" diff --git a/4.3/php8.2/apache/makedb.php b/4.3/php8.2/apache/makedb.php new file mode 100644 index 0000000..f6db25e --- /dev/null +++ b/4.3/php8.2/apache/makedb.php @@ -0,0 +1,102 @@ + 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/4.3/php8.2/fpm-alpine/Dockerfile b/4.3/php8.2/fpm-alpine/Dockerfile new file mode 100644 index 0000000..e77d241 --- /dev/null +++ b/4.3/php8.2/fpm-alpine/Dockerfile @@ -0,0 +1,153 @@ +# +# 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 \ + ; + +# 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.6.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.22; \ + pecl install memcached-3.2.0; \ + pecl install redis-5.3.7; \ + \ + 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'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /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 4.3.2 +ENV JOOMLA_SHA512 b04eaaf4409a9647eaef6fa4ae98123b019e57b67ca717e941dd546d8ef453cdab87c6b95ea3028b8bde6c0e47b5732ba5efd99d278f6a8b8309980f5719bc90 + +# Download package and extract to web volume +RUN set -ex; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.2/Joomla_4.3.2-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; \ + rm joomla.tar.bz2; \ + 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/4.3/php8.2/fpm-alpine/docker-entrypoint.sh b/4.3/php8.2/fpm-alpine/docker-entrypoint.sh new file mode 100755 index 0000000..080a2ac --- /dev/null +++ b/4.3/php8.2/fpm-alpine/docker-entrypoint.sh @@ -0,0 +1,135 @@ +#!/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}" + + 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 + +exec "$@" diff --git a/4.3/php8.2/fpm-alpine/makedb.php b/4.3/php8.2/fpm-alpine/makedb.php new file mode 100644 index 0000000..f6db25e --- /dev/null +++ b/4.3/php8.2/fpm-alpine/makedb.php @@ -0,0 +1,102 @@ + 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/4.3/php8.2/fpm/Dockerfile b/4.3/php8.2/fpm/Dockerfile new file mode 100644 index 0000000..071abce --- /dev/null +++ b/4.3/php8.2/fpm/Dockerfile @@ -0,0 +1,155 @@ +# +# 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 \ + ; \ + 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.6.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.22; \ + pecl install memcached-3.2.0; \ + pecl install redis-5.3.7; \ + \ + 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 '/=>/ { print $3 }' \ + | sort -u \ + | xargs -r dpkg-query -S \ + | 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'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /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 4.3.2 +ENV JOOMLA_SHA512 b04eaaf4409a9647eaef6fa4ae98123b019e57b67ca717e941dd546d8ef453cdab87c6b95ea3028b8bde6c0e47b5732ba5efd99d278f6a8b8309980f5719bc90 + +# Download package and extract to web volume +RUN set -ex; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/4.3.2/Joomla_4.3.2-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; \ + rm joomla.tar.bz2; \ + 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/4.3/php8.2/fpm/docker-entrypoint.sh b/4.3/php8.2/fpm/docker-entrypoint.sh new file mode 100755 index 0000000..080a2ac --- /dev/null +++ b/4.3/php8.2/fpm/docker-entrypoint.sh @@ -0,0 +1,135 @@ +#!/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}" + + 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 + +exec "$@" diff --git a/4.3/php8.2/fpm/makedb.php b/4.3/php8.2/fpm/makedb.php new file mode 100644 index 0000000..f6db25e --- /dev/null +++ b/4.3/php8.2/fpm/makedb.php @@ -0,0 +1,102 @@ + 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/versions-helper.json b/versions-helper.json index 4071f95..d2d8c19 100644 --- a/versions-helper.json +++ b/versions-helper.json @@ -4,6 +4,13 @@ "php": "8.0", "aliases": [4, "latest"], "phpVersions": { + "8.2": { + "pecl": { + "APCu": "5.1.22", + "memcached": "3.2.0", + "redis": "5.3.7" + } + }, "8.1": { "pecl": { "APCu": "5.1.21", @@ -33,7 +40,7 @@ "phpVersions": { "8.0": { "pecl": { - "APCu": "5.1.21", + "APCu": "5.1.22", "memcached": "3.2.0", "redis": "5.3.7", "mcrypt": "1.0.4" diff --git a/versions.json b/versions.json index a13e74e..7ae867a 100644 --- a/versions.json +++ b/versions.json @@ -26,7 +26,8 @@ "php": "8.0", "phpVersions": [ "8.0", - "8.1" + "8.1", + "8.2" ], "sha512": "b04eaaf4409a9647eaef6fa4ae98123b019e57b67ca717e941dd546d8ef453cdab87c6b95ea3028b8bde6c0e47b5732ba5efd99d278f6a8b8309980f5719bc90", "variant": "apache",