diff --git a/3.10/php7.3/apache/Dockerfile b/3.10/php7.3/apache/Dockerfile index 790212b..e43c982 100644 --- a/3.10/php7.3/apache/Dockerfile +++ b/3.10/php7.3/apache/Dockerfile @@ -74,8 +74,8 @@ RUN set -ex; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 3.10.5 -ENV JOOMLA_SHA512 c635370d2dc9f1b8aab98751b15e7a3085b41deb47d578172c702f7d63967b9968fb35929a7131aa0ecf63529a7b166bc9976a3ced01fac5ee4941337c65eb37 +ENV JOOMLA_VERSION 3.10.6 +ENV JOOMLA_SHA512 cd871290f83d6fd1a2e3fe077735e86554a1b3825e5d7e831df7aad56831ee6a958d77e92fa50c0cbbd240ed1158d4c1eadc8c1e968c990db5c89c4f5ee40a0a # Download package and extract to web volume RUN set -ex; \ diff --git a/3.10/php7.3/fpm-alpine/Dockerfile b/3.10/php7.3/fpm-alpine/Dockerfile index 2722764..f69ee48 100644 --- a/3.10/php7.3/fpm-alpine/Dockerfile +++ b/3.10/php7.3/fpm-alpine/Dockerfile @@ -71,8 +71,8 @@ RUN set -ex; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 3.10.5 -ENV JOOMLA_SHA512 c635370d2dc9f1b8aab98751b15e7a3085b41deb47d578172c702f7d63967b9968fb35929a7131aa0ecf63529a7b166bc9976a3ced01fac5ee4941337c65eb37 +ENV JOOMLA_VERSION 3.10.6 +ENV JOOMLA_SHA512 cd871290f83d6fd1a2e3fe077735e86554a1b3825e5d7e831df7aad56831ee6a958d77e92fa50c0cbbd240ed1158d4c1eadc8c1e968c990db5c89c4f5ee40a0a # Download package and extract to web volume RUN set -ex; \ diff --git a/3.10/php7.3/fpm/Dockerfile b/3.10/php7.3/fpm/Dockerfile index 727f20e..19c902a 100644 --- a/3.10/php7.3/fpm/Dockerfile +++ b/3.10/php7.3/fpm/Dockerfile @@ -72,8 +72,8 @@ RUN set -ex; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 3.10.5 -ENV JOOMLA_SHA512 c635370d2dc9f1b8aab98751b15e7a3085b41deb47d578172c702f7d63967b9968fb35929a7131aa0ecf63529a7b166bc9976a3ced01fac5ee4941337c65eb37 +ENV JOOMLA_VERSION 3.10.6 +ENV JOOMLA_SHA512 cd871290f83d6fd1a2e3fe077735e86554a1b3825e5d7e831df7aad56831ee6a958d77e92fa50c0cbbd240ed1158d4c1eadc8c1e968c990db5c89c4f5ee40a0a # Download package and extract to web volume RUN set -ex; \ diff --git a/3.10/php7.4/apache/Dockerfile b/3.10/php7.4/apache/Dockerfile index 52b3d68..2ad4c90 100644 --- a/3.10/php7.4/apache/Dockerfile +++ b/3.10/php7.4/apache/Dockerfile @@ -74,8 +74,8 @@ RUN set -ex; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 3.10.5 -ENV JOOMLA_SHA512 c635370d2dc9f1b8aab98751b15e7a3085b41deb47d578172c702f7d63967b9968fb35929a7131aa0ecf63529a7b166bc9976a3ced01fac5ee4941337c65eb37 +ENV JOOMLA_VERSION 3.10.6 +ENV JOOMLA_SHA512 cd871290f83d6fd1a2e3fe077735e86554a1b3825e5d7e831df7aad56831ee6a958d77e92fa50c0cbbd240ed1158d4c1eadc8c1e968c990db5c89c4f5ee40a0a # Download package and extract to web volume RUN set -ex; \ diff --git a/3.10/php7.4/fpm-alpine/Dockerfile b/3.10/php7.4/fpm-alpine/Dockerfile index d2a818a..8682da2 100644 --- a/3.10/php7.4/fpm-alpine/Dockerfile +++ b/3.10/php7.4/fpm-alpine/Dockerfile @@ -71,8 +71,8 @@ RUN set -ex; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 3.10.5 -ENV JOOMLA_SHA512 c635370d2dc9f1b8aab98751b15e7a3085b41deb47d578172c702f7d63967b9968fb35929a7131aa0ecf63529a7b166bc9976a3ced01fac5ee4941337c65eb37 +ENV JOOMLA_VERSION 3.10.6 +ENV JOOMLA_SHA512 cd871290f83d6fd1a2e3fe077735e86554a1b3825e5d7e831df7aad56831ee6a958d77e92fa50c0cbbd240ed1158d4c1eadc8c1e968c990db5c89c4f5ee40a0a # Download package and extract to web volume RUN set -ex; \ diff --git a/3.10/php7.4/fpm/Dockerfile b/3.10/php7.4/fpm/Dockerfile index 15cd5e7..6d10d49 100644 --- a/3.10/php7.4/fpm/Dockerfile +++ b/3.10/php7.4/fpm/Dockerfile @@ -72,8 +72,8 @@ RUN set -ex; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 3.10.5 -ENV JOOMLA_SHA512 c635370d2dc9f1b8aab98751b15e7a3085b41deb47d578172c702f7d63967b9968fb35929a7131aa0ecf63529a7b166bc9976a3ced01fac5ee4941337c65eb37 +ENV JOOMLA_VERSION 3.10.6 +ENV JOOMLA_SHA512 cd871290f83d6fd1a2e3fe077735e86554a1b3825e5d7e831df7aad56831ee6a958d77e92fa50c0cbbd240ed1158d4c1eadc8c1e968c990db5c89c4f5ee40a0a # Download package and extract to web volume RUN set -ex; \ diff --git a/4.0/php7.4/apache/Dockerfile b/4.1/php7.4/apache/Dockerfile similarity index 92% rename from 4.0/php7.4/apache/Dockerfile rename to 4.1/php7.4/apache/Dockerfile index 6c4a5e2..b5ac593 100644 --- a/4.0/php7.4/apache/Dockerfile +++ b/4.1/php7.4/apache/Dockerfile @@ -24,7 +24,6 @@ RUN set -ex; \ libicu-dev \ libjpeg-dev \ libldap2-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ @@ -50,7 +49,7 @@ RUN set -ex; \ # 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 memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.6; \ \ docker-php-ext-enable \ apcu \ @@ -76,8 +75,8 @@ RUN set -ex; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.0.6 -ENV JOOMLA_SHA512 a35f3181c594ef0c30e4f8ec122f32e2ebe1795ccd31f55656be0f214b1f6eed54ef7961aed0be772b2c4a6cc5d0e6454b9213f1ba8833dd52317c6d216d9fd8 +ENV JOOMLA_VERSION 4.1.0 +ENV JOOMLA_SHA512 44173170fb1598c465415cba919339c26624322621efed17c95fdffca7b62a1089863615e415f0ec36a6a4c4f5c746b7ec06dddd08929757f737e1a2a15ff714 # Download package and extract to web volume RUN set -ex; \ diff --git a/4.0/php7.4/apache/docker-entrypoint.sh b/4.1/php7.4/apache/docker-entrypoint.sh similarity index 100% rename from 4.0/php7.4/apache/docker-entrypoint.sh rename to 4.1/php7.4/apache/docker-entrypoint.sh diff --git a/4.0/php7.4/apache/makedb.php b/4.1/php7.4/apache/makedb.php similarity index 100% rename from 4.0/php7.4/apache/makedb.php rename to 4.1/php7.4/apache/makedb.php diff --git a/4.0/php7.4/fpm-alpine/Dockerfile b/4.1/php7.4/fpm-alpine/Dockerfile similarity index 89% rename from 4.0/php7.4/fpm-alpine/Dockerfile rename to 4.1/php7.4/fpm-alpine/Dockerfile index db2db02..0a2c801 100644 --- a/4.0/php7.4/fpm-alpine/Dockerfile +++ b/4.1/php7.4/fpm-alpine/Dockerfile @@ -23,7 +23,6 @@ RUN set -ex; \ gmp-dev \ icu-dev \ libjpeg-turbo-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libzip-dev \ @@ -49,13 +48,11 @@ RUN set -ex; \ \ # 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 mcrypt-1.0.4; \ pecl install memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.6; \ \ docker-php-ext-enable \ apcu \ - mcrypt \ memcached \ redis \ ; \ @@ -73,8 +70,8 @@ RUN set -ex; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.0.6 -ENV JOOMLA_SHA512 a35f3181c594ef0c30e4f8ec122f32e2ebe1795ccd31f55656be0f214b1f6eed54ef7961aed0be772b2c4a6cc5d0e6454b9213f1ba8833dd52317c6d216d9fd8 +ENV JOOMLA_VERSION 4.1.0 +ENV JOOMLA_SHA512 44173170fb1598c465415cba919339c26624322621efed17c95fdffca7b62a1089863615e415f0ec36a6a4c4f5c746b7ec06dddd08929757f737e1a2a15ff714 # Download package and extract to web volume RUN set -ex; \ diff --git a/4.0/php7.4/fpm-alpine/docker-entrypoint.sh b/4.1/php7.4/fpm-alpine/docker-entrypoint.sh similarity index 100% rename from 4.0/php7.4/fpm-alpine/docker-entrypoint.sh rename to 4.1/php7.4/fpm-alpine/docker-entrypoint.sh diff --git a/4.0/php7.4/fpm-alpine/makedb.php b/4.1/php7.4/fpm-alpine/makedb.php similarity index 100% rename from 4.0/php7.4/fpm-alpine/makedb.php rename to 4.1/php7.4/fpm-alpine/makedb.php diff --git a/4.0/php7.4/fpm/Dockerfile b/4.1/php7.4/fpm/Dockerfile similarity index 91% rename from 4.0/php7.4/fpm/Dockerfile rename to 4.1/php7.4/fpm/Dockerfile index 6b87dec..6f56598 100644 --- a/4.0/php7.4/fpm/Dockerfile +++ b/4.1/php7.4/fpm/Dockerfile @@ -22,7 +22,6 @@ RUN set -ex; \ libicu-dev \ libjpeg-dev \ libldap2-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ @@ -48,7 +47,7 @@ RUN set -ex; \ # 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 memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.6; \ \ docker-php-ext-enable \ apcu \ @@ -74,8 +73,8 @@ RUN set -ex; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.0.6 -ENV JOOMLA_SHA512 a35f3181c594ef0c30e4f8ec122f32e2ebe1795ccd31f55656be0f214b1f6eed54ef7961aed0be772b2c4a6cc5d0e6454b9213f1ba8833dd52317c6d216d9fd8 +ENV JOOMLA_VERSION 4.1.0 +ENV JOOMLA_SHA512 44173170fb1598c465415cba919339c26624322621efed17c95fdffca7b62a1089863615e415f0ec36a6a4c4f5c746b7ec06dddd08929757f737e1a2a15ff714 # Download package and extract to web volume RUN set -ex; \ diff --git a/4.0/php7.4/fpm/docker-entrypoint.sh b/4.1/php7.4/fpm/docker-entrypoint.sh similarity index 100% rename from 4.0/php7.4/fpm/docker-entrypoint.sh rename to 4.1/php7.4/fpm/docker-entrypoint.sh diff --git a/4.0/php7.4/fpm/makedb.php b/4.1/php7.4/fpm/makedb.php similarity index 100% rename from 4.0/php7.4/fpm/makedb.php rename to 4.1/php7.4/fpm/makedb.php diff --git a/4.0/php8.0/apache/Dockerfile b/4.1/php8.0/apache/Dockerfile similarity index 92% rename from 4.0/php8.0/apache/Dockerfile rename to 4.1/php8.0/apache/Dockerfile index d2676af..2afe55e 100644 --- a/4.0/php8.0/apache/Dockerfile +++ b/4.1/php8.0/apache/Dockerfile @@ -24,7 +24,6 @@ RUN set -ex; \ libicu-dev \ libjpeg-dev \ libldap2-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ @@ -50,7 +49,7 @@ RUN set -ex; \ # 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 memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.6; \ \ docker-php-ext-enable \ apcu \ @@ -76,8 +75,8 @@ RUN set -ex; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.0.6 -ENV JOOMLA_SHA512 a35f3181c594ef0c30e4f8ec122f32e2ebe1795ccd31f55656be0f214b1f6eed54ef7961aed0be772b2c4a6cc5d0e6454b9213f1ba8833dd52317c6d216d9fd8 +ENV JOOMLA_VERSION 4.1.0 +ENV JOOMLA_SHA512 44173170fb1598c465415cba919339c26624322621efed17c95fdffca7b62a1089863615e415f0ec36a6a4c4f5c746b7ec06dddd08929757f737e1a2a15ff714 # Download package and extract to web volume RUN set -ex; \ diff --git a/4.0/php8.0/apache/docker-entrypoint.sh b/4.1/php8.0/apache/docker-entrypoint.sh similarity index 100% rename from 4.0/php8.0/apache/docker-entrypoint.sh rename to 4.1/php8.0/apache/docker-entrypoint.sh diff --git a/4.0/php8.0/apache/makedb.php b/4.1/php8.0/apache/makedb.php similarity index 100% rename from 4.0/php8.0/apache/makedb.php rename to 4.1/php8.0/apache/makedb.php diff --git a/4.0/php8.0/fpm-alpine/Dockerfile b/4.1/php8.0/fpm-alpine/Dockerfile similarity index 89% rename from 4.0/php8.0/fpm-alpine/Dockerfile rename to 4.1/php8.0/fpm-alpine/Dockerfile index 474c939..4667e25 100644 --- a/4.0/php8.0/fpm-alpine/Dockerfile +++ b/4.1/php8.0/fpm-alpine/Dockerfile @@ -23,7 +23,6 @@ RUN set -ex; \ gmp-dev \ icu-dev \ libjpeg-turbo-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libzip-dev \ @@ -49,13 +48,11 @@ RUN set -ex; \ \ # 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 mcrypt-1.0.4; \ pecl install memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.6; \ \ docker-php-ext-enable \ apcu \ - mcrypt \ memcached \ redis \ ; \ @@ -73,8 +70,8 @@ RUN set -ex; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.0.6 -ENV JOOMLA_SHA512 a35f3181c594ef0c30e4f8ec122f32e2ebe1795ccd31f55656be0f214b1f6eed54ef7961aed0be772b2c4a6cc5d0e6454b9213f1ba8833dd52317c6d216d9fd8 +ENV JOOMLA_VERSION 4.1.0 +ENV JOOMLA_SHA512 44173170fb1598c465415cba919339c26624322621efed17c95fdffca7b62a1089863615e415f0ec36a6a4c4f5c746b7ec06dddd08929757f737e1a2a15ff714 # Download package and extract to web volume RUN set -ex; \ diff --git a/4.0/php8.0/fpm-alpine/docker-entrypoint.sh b/4.1/php8.0/fpm-alpine/docker-entrypoint.sh similarity index 100% rename from 4.0/php8.0/fpm-alpine/docker-entrypoint.sh rename to 4.1/php8.0/fpm-alpine/docker-entrypoint.sh diff --git a/4.0/php8.0/fpm-alpine/makedb.php b/4.1/php8.0/fpm-alpine/makedb.php similarity index 100% rename from 4.0/php8.0/fpm-alpine/makedb.php rename to 4.1/php8.0/fpm-alpine/makedb.php diff --git a/4.0/php8.0/fpm/Dockerfile b/4.1/php8.0/fpm/Dockerfile similarity index 91% rename from 4.0/php8.0/fpm/Dockerfile rename to 4.1/php8.0/fpm/Dockerfile index d92971e..bb064cc 100644 --- a/4.0/php8.0/fpm/Dockerfile +++ b/4.1/php8.0/fpm/Dockerfile @@ -22,7 +22,6 @@ RUN set -ex; \ libicu-dev \ libjpeg-dev \ libldap2-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ @@ -48,7 +47,7 @@ RUN set -ex; \ # 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 memcached-3.1.5; \ - pecl install redis-5.3.4; \ + pecl install redis-5.3.6; \ \ docker-php-ext-enable \ apcu \ @@ -74,8 +73,8 @@ RUN set -ex; \ VOLUME /var/www/html # Define Joomla version and expected SHA512 signature -ENV JOOMLA_VERSION 4.0.6 -ENV JOOMLA_SHA512 a35f3181c594ef0c30e4f8ec122f32e2ebe1795ccd31f55656be0f214b1f6eed54ef7961aed0be772b2c4a6cc5d0e6454b9213f1ba8833dd52317c6d216d9fd8 +ENV JOOMLA_VERSION 4.1.0 +ENV JOOMLA_SHA512 44173170fb1598c465415cba919339c26624322621efed17c95fdffca7b62a1089863615e415f0ec36a6a4c4f5c746b7ec06dddd08929757f737e1a2a15ff714 # Download package and extract to web volume RUN set -ex; \ diff --git a/4.0/php8.0/fpm/docker-entrypoint.sh b/4.1/php8.0/fpm/docker-entrypoint.sh similarity index 100% rename from 4.0/php8.0/fpm/docker-entrypoint.sh rename to 4.1/php8.0/fpm/docker-entrypoint.sh diff --git a/4.0/php8.0/fpm/makedb.php b/4.1/php8.0/fpm/makedb.php similarity index 100% rename from 4.0/php8.0/fpm/makedb.php rename to 4.1/php8.0/fpm/makedb.php diff --git a/4.1/php8.1/apache/Dockerfile b/4.1/php8.1/apache/Dockerfile new file mode 100644 index 0000000..f19c510 --- /dev/null +++ b/4.1/php8.1/apache/Dockerfile @@ -0,0 +1,97 @@ +# +# 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 +# Enable Apache Rewrite Module +RUN a2enmod rewrite +# Install the PHP extensions +RUN set -ex; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libbz2-dev \ + libgmp-dev \ + libicu-dev \ + libjpeg-dev \ + libldap2-dev \ + libmemcached-dev \ + libpng-dev \ + libpq-dev \ + libzip-dev \ + ; \ + \ + docker-php-ext-configure gd --with-jpeg; \ + debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ + docker-php-ext-install -j "$(nproc)" \ + bz2 \ + gd \ + gmp \ + intl \ + ldap \ + mysqli \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + zip \ + ; \ + \ +# 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 memcached-3.1.5; \ + pecl install redis-5.3.6; \ + \ + 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 "$(php -r 'echo ini_get("extension_dir");')"/*.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/* + +VOLUME /var/www/html + +# Define Joomla version and expected SHA512 signature +ENV JOOMLA_VERSION 4.1.0 +ENV JOOMLA_SHA512 44173170fb1598c465415cba919339c26624322621efed17c95fdffca7b62a1089863615e415f0ec36a6a4c4f5c746b7ec06dddd08929757f737e1a2a15ff714 + +# Download package and extract to web volume +RUN set -ex; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-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 and custom .htaccess +COPY docker-entrypoint.sh /entrypoint.sh +COPY makedb.php /makedb.php + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["apache2-foreground"] + +# vim:set ft=dockerfile: diff --git a/4.1/php8.1/apache/docker-entrypoint.sh b/4.1/php8.1/apache/docker-entrypoint.sh new file mode 100755 index 0000000..26346ea --- /dev/null +++ b/4.1/php8.1/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" + + 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.1/php8.1/apache/makedb.php b/4.1/php8.1/apache/makedb.php new file mode 100644 index 0000000..502135c --- /dev/null +++ b/4.1/php8.1/apache/makedb.php @@ -0,0 +1,46 @@ + makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME" +$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 = 3306; +} + +$maxTries = 10; + +do +{ + $mysql = new mysqli($host, $argv[2], $argv[3], '', (int) $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($argv[4]) . '`')) +{ + fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n"); + $mysql->close(); + exit(1); +} + +fwrite($stderr, "\nMySQL Database Created\n"); + +$mysql->close(); diff --git a/4.1/php8.1/fpm-alpine/Dockerfile b/4.1/php8.1/fpm-alpine/Dockerfile new file mode 100644 index 0000000..a560da6 --- /dev/null +++ b/4.1/php8.1/fpm-alpine/Dockerfile @@ -0,0 +1,93 @@ +# +# 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 +# entrypoint.sh dependencies +RUN apk add --no-cache \ + bash +# Install the PHP extensions +RUN set -ex; \ + \ + apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ + autoconf \ + bzip2-dev \ + gmp-dev \ + icu-dev \ + libjpeg-turbo-dev \ + libmemcached-dev \ + libpng-dev \ + libzip-dev \ + openldap-dev \ + pcre-dev \ + postgresql-dev \ + ; \ + \ + docker-php-ext-configure gd --with-jpeg; \ + docker-php-ext-configure ldap; \ + docker-php-ext-install -j "$(nproc)" \ + bz2 \ + gd \ + gmp \ + intl \ + ldap \ + mysqli \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + zip \ + ; \ + \ +# 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 memcached-3.1.5; \ + pecl install redis-5.3.6; \ + \ + docker-php-ext-enable \ + apcu \ + memcached \ + redis \ + ; \ + rm -r /tmp/pear; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --virtual .joomla-phpext-rundeps $runDeps; \ + apk del .build-deps + +VOLUME /var/www/html + +# Define Joomla version and expected SHA512 signature +ENV JOOMLA_VERSION 4.1.0 +ENV JOOMLA_SHA512 44173170fb1598c465415cba919339c26624322621efed17c95fdffca7b62a1089863615e415f0ec36a6a4c4f5c746b7ec06dddd08929757f737e1a2a15ff714 + +# Download package and extract to web volume +RUN set -ex; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-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 and custom .htaccess +COPY docker-entrypoint.sh /entrypoint.sh +COPY makedb.php /makedb.php + +ENTRYPOINT ["/entrypoint.sh"] + +CMD ["php-fpm"] + +# vim:set ft=dockerfile: diff --git a/4.1/php8.1/fpm-alpine/docker-entrypoint.sh b/4.1/php8.1/fpm-alpine/docker-entrypoint.sh new file mode 100755 index 0000000..26346ea --- /dev/null +++ b/4.1/php8.1/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" + + 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.1/php8.1/fpm-alpine/makedb.php b/4.1/php8.1/fpm-alpine/makedb.php new file mode 100644 index 0000000..502135c --- /dev/null +++ b/4.1/php8.1/fpm-alpine/makedb.php @@ -0,0 +1,46 @@ + makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME" +$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 = 3306; +} + +$maxTries = 10; + +do +{ + $mysql = new mysqli($host, $argv[2], $argv[3], '', (int) $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($argv[4]) . '`')) +{ + fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n"); + $mysql->close(); + exit(1); +} + +fwrite($stderr, "\nMySQL Database Created\n"); + +$mysql->close(); diff --git a/4.1/php8.1/fpm/Dockerfile b/4.1/php8.1/fpm/Dockerfile new file mode 100644 index 0000000..559d592 --- /dev/null +++ b/4.1/php8.1/fpm/Dockerfile @@ -0,0 +1,96 @@ +# +# 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 +# Install the PHP extensions +RUN set -ex; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libbz2-dev \ + libgmp-dev \ + libicu-dev \ + libjpeg-dev \ + libldap2-dev \ + libmemcached-dev \ + libpng-dev \ + libpq-dev \ + libzip-dev \ + ; \ + \ + docker-php-ext-configure gd --with-jpeg; \ + debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ + docker-php-ext-install -j "$(nproc)" \ + bz2 \ + gd \ + gmp \ + intl \ + ldap \ + mysqli \ + pdo_mysql \ + pdo_pgsql \ + pgsql \ + zip \ + ; \ + \ +# 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 memcached-3.1.5; \ + pecl install redis-5.3.6; \ + \ + 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 "$(php -r 'echo ini_get("extension_dir");')"/*.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/* + +VOLUME /var/www/html + +# Define Joomla version and expected SHA512 signature +ENV JOOMLA_VERSION 4.1.0 +ENV JOOMLA_SHA512 44173170fb1598c465415cba919339c26624322621efed17c95fdffca7b62a1089863615e415f0ec36a6a4c4f5c746b7ec06dddd08929757f737e1a2a15ff714 + +# Download package and extract to web volume +RUN set -ex; \ + curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-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 and custom .htaccess +COPY docker-entrypoint.sh /entrypoint.sh +COPY makedb.php /makedb.php + +ENTRYPOINT ["/entrypoint.sh"] + +CMD ["php-fpm"] + +# vim:set ft=dockerfile: diff --git a/4.1/php8.1/fpm/docker-entrypoint.sh b/4.1/php8.1/fpm/docker-entrypoint.sh new file mode 100755 index 0000000..26346ea --- /dev/null +++ b/4.1/php8.1/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" + + 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.1/php8.1/fpm/makedb.php b/4.1/php8.1/fpm/makedb.php new file mode 100644 index 0000000..502135c --- /dev/null +++ b/4.1/php8.1/fpm/makedb.php @@ -0,0 +1,46 @@ + makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME" +$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 = 3306; +} + +$maxTries = 10; + +do +{ + $mysql = new mysqli($host, $argv[2], $argv[3], '', (int) $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($argv[4]) . '`')) +{ + fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n"); + $mysql->close(); + exit(1); +} + +fwrite($stderr, "\nMySQL Database Created\n"); + +$mysql->close(); diff --git a/Dockerfile.template b/Dockerfile.template index 3e35e97..13ccac8 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -26,11 +26,13 @@ RUN set -ex; \ autoconf \ bzip2-dev \ gmp-dev \ -{{ if env.version == "4.0" then ( -}} +{{ if env.version == "4.1" then ( -}} icu-dev \ {{ ) else "" end -}} libjpeg-turbo-dev \ +{{ if env.version == "3.10" then ( -}} libmcrypt-dev \ +{{ ) else "" end -}} libmemcached-dev \ libpng-dev \ libzip-dev \ @@ -49,7 +51,7 @@ RUN set -ex; \ bz2 \ gd \ gmp \ -{{ if env.version == "4.0" then ( -}} +{{ if env.version == "4.1" then ( -}} intl \ {{ ) else "" end -}} ldap \ @@ -62,13 +64,17 @@ RUN set -ex; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-{{ env.pecl_APCu }}; \ +{{ if env.version == "3.10" then ( -}} pecl install mcrypt-{{ env.pecl_mcrypt }}; \ +{{ ) else "" end -}} pecl install memcached-{{ env.pecl_memcached }}; \ pecl install redis-{{ env.pecl_redis }}; \ \ docker-php-ext-enable \ apcu \ +{{ if env.version == "3.10" then ( -}} mcrypt \ +{{ ) else "" end -}} memcached \ redis \ ; \ @@ -90,12 +96,14 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ libbz2-dev \ libgmp-dev \ -{{ if env.version == "4.0" then ( -}} +{{ if env.version == "4.1" then ( -}} libicu-dev \ {{ ) else "" end -}} libjpeg-dev \ libldap2-dev \ +{{ if env.version == "3.10" then ( -}} libmcrypt-dev \ +{{ ) else "" end -}} libmemcached-dev \ libpng-dev \ libpq-dev \ @@ -113,7 +121,7 @@ RUN set -ex; \ bz2 \ gd \ gmp \ -{{ if env.version == "4.0" then ( -}} +{{ if env.version == "4.1" then ( -}} intl \ {{ ) else "" end -}} ldap \ diff --git a/versions-helper.json b/versions-helper.json index e363d29..6dd6122 100644 --- a/versions-helper.json +++ b/versions-helper.json @@ -1,23 +1,28 @@ { - "4.0": { - "version": "4.0.6", + "4.1": { + "version": "4.1.0", "php": "8.0", "aliases": [4, "latest"], "phpVersions": { + "8.1": { + "pecl": { + "APCu": "5.1.21", + "memcached": "3.1.5", + "redis": "5.3.6" + } + }, "8.0": { "pecl": { "APCu": "5.1.21", "memcached": "3.1.5", - "redis": "5.3.4", - "mcrypt": "1.0.4" + "redis": "5.3.6" } }, "7.4": { "pecl": { "APCu": "5.1.21", "memcached": "3.1.5", - "redis": "5.3.4", - "mcrypt": "1.0.4" + "redis": "5.3.6" } } }, @@ -29,7 +34,7 @@ ] }, "3.10": { - "version": "3.10.5", + "version": "3.10.6", "php": "7.4", "aliases": [3], "phpVersions": { diff --git a/versions.json b/versions.json index 0c8f9b8..eb46a14 100644 --- a/versions.json +++ b/versions.json @@ -8,16 +8,16 @@ "7.3", "7.4" ], - "sha512": "c635370d2dc9f1b8aab98751b15e7a3085b41deb47d578172c702f7d63967b9968fb35929a7131aa0ecf63529a7b166bc9976a3ced01fac5ee4941337c65eb37", + "sha512": "cd871290f83d6fd1a2e3fe077735e86554a1b3825e5d7e831df7aad56831ee6a958d77e92fa50c0cbbd240ed1158d4c1eadc8c1e968c990db5c89c4f5ee40a0a", "variant": "apache", "variants": [ "apache", "fpm-alpine", "fpm" ], - "version": "3.10.5" + "version": "3.10.6" }, - "4.0": { + "4.1": { "aliases": [ 4, "latest" @@ -25,15 +25,16 @@ "php": "8.0", "phpVersions": [ "7.4", - "8.0" + "8.0", + "8.1" ], - "sha512": "a35f3181c594ef0c30e4f8ec122f32e2ebe1795ccd31f55656be0f214b1f6eed54ef7961aed0be772b2c4a6cc5d0e6454b9213f1ba8833dd52317c6d216d9fd8", + "sha512": "44173170fb1598c465415cba919339c26624322621efed17c95fdffca7b62a1089863615e415f0ec36a6a4c4f5c746b7ec06dddd08929757f737e1a2a15ff714", "variant": "apache", "variants": [ "apache", "fpm-alpine", "fpm" ], - "version": "4.0.6" + "version": "4.1.0" } }