diff --git a/5.2.rc/php8.1/apache/Dockerfile b/5.2.rc/php8.1/apache/Dockerfile deleted file mode 100644 index a98652b..0000000 --- a/5.2.rc/php8.1/apache/Dockerfile +++ /dev/null @@ -1,184 +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 -# https://github.com/Imagick/imagick/commit/5ae2ecf20a1157073bad0170106ad0cf74e01cb6 (causes a lot of build failures, but strangely only intermittent ones) -# see also https://github.com/Imagick/imagick/pull/641 -# this is "pecl install imagick-3.7.0", but by hand so we can apply a small hack / part of the above commit -# Thanks to @tianon https://github.com/docker-library/wordpress/commit/509adb58cbc7463a03e317931df65868ec8a3e92 - curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \ - echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \ - tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \ - test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \ - sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php && exit 1 || :; \ - docker-php-ext-install /tmp/imagick-3.7.0; \ - rm -rf imagick.tgz /tmp/imagick-3.7.0; \ -# TODO when imagick has another release, we should ditch this whole block and just update instead - \ -# 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.2.0-rc1 -ENV JOOMLA_SHA512 51dd71e8f58eeba4b86bbedcd8235780bdf5db73852261154d1a0f1b057bda4395be03a60b1173f8b82d791739c0ef224e5c203c8989c54d0c2e31b45fd41b00 - -# 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.2.0-rc1/Joomla_5.2.0-rc1-Release_Candidate-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.2.rc/php8.1/apache/docker-entrypoint.sh b/5.2.rc/php8.1/apache/docker-entrypoint.sh deleted file mode 100755 index 6255d23..0000000 --- a/5.2.rc/php8.1/apache/docker-entrypoint.sh +++ /dev/null @@ -1,385 +0,0 @@ -#!/bin/bash -set -e - -# Load database password from file if specified -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -# Function to log messages -joomla_log() { - local msg="$1" - echo >&2 " $msg" -} - -# Function to log info messages -joomla_log_info() { - local msg="$1" - echo >&2 "[INFO] $msg" -} - -# Function to log warning messages -joomla_log_warning() { - local msg="$1" - echo >&2 "[WARNING] $msg" -} - -# Function to log error messages -joomla_log_error() { - local msg="$1" - echo >&2 "[ERROR] $msg" -} - -# Function to set a line -joomla_echo_line() { - echo >&2 "========================================================================" -} - -# Function to set a line at end -joomla_echo_line_start() { - joomla_echo_line - echo >&2 -} - -# Function to set a line at end -joomla_echo_line_end() { - echo >&2 - joomla_echo_line -} - -# Function to give final success message (1) -joomla_log_configured_success_message() { - joomla_log "This server is now configured to run Joomla!" -} - -# Function to give final success message (2) -joomla_log_success_and_need_db_message() { - joomla_log_configured_success_message - echo >&2 - joomla_log " NOTE: You will need your database server address, database name," - joomla_log " and database user credentials to install Joomla." -} - -# Function to validate URLs -joomla_validate_url() { - if [[ $1 =~ ^http(s)?://[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(/.*)?$ ]]; then - return 0 - else - return 1 - fi -} - -# Function to validate file path -joomla_validate_path() { - if [[ -f $1 ]]; then - return 0 - else - return 1 - fi -} - -# Function to split values by semicolon -joomla_get_array_by_semicolon() { - local input=$1 # The input string to be split - local -n arr=$2 # The array to store the split values (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=';' read -ra arr <<< "$input" # Split the input by semicolon and store in array - IFS=$old_IFS # Restore the original IFS value -} - -# Function to split values by colon to get host and port -joomla_get_host_port_by_colon() { - local input=$1 # The input string to be split - local -n hostname=$2 # The variable to store the hostname (passed by reference) - local -n port=$3 # The variable to store the port (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=':' read -r hostname port <<< "$input" # Split the input by colon and store in hostname and port - IFS=$old_IFS # Restore the original IFS value -} - -# Function to install extension from URL -joomla_install_extension_via_url() { - local url=$1 - if joomla_validate_url "$url"; then - if php cli/joomla.php extension:install --url "$url" --no-interaction; then - joomla_log_info "Successfully installed $url" - else - joomla_log_error "Failed to install $url" - fi - else - joomla_log_error "Invalid URL: $url" - fi -} - -# Function to install extension from path -joomla_install_extension_via_path() { - local path=$1 - if joomla_validate_path "$path"; then - if php cli/joomla.php extension:install --path "$path" --no-interaction; then - joomla_log_info "Successfully installed $path" - else - joomla_log_error "Failed to install $path" - fi - else - joomla_log_error "Invalid Path: $path" - fi -} - -# Function to validate necessary environment variables -joomla_validate_vars() { - # Basic email regex for validation - local email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_error "JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - return 0 -} - -# Function to check if auto deploy can be done -joomla_can_auto_deploy() { - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - if joomla_validate_vars; then - return 0 - fi - fi - - return 1 -} - -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 - - # start Joomla message block - joomla_echo_line_start - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - joomla_log_warning "both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - joomla_log "Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - joomla_log "instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - joomla_log_error "Missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables." - joomla_log "Did you forget to --link some_mysql_container:mysql or set an external db" - joomla_log "with -e JOOMLA_DB_HOST=hostname:port?" - # end Joomla message block - joomla_echo_line_end - 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 - joomla_log_error "Missing required JOOMLA_DB_PASSWORD environment variable." - joomla_log "Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - joomla_log "(Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - # end Joomla message block - joomla_echo_line_end - 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 - - joomla_log_info "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - joomla_log_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 - - joomla_log "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}" - - # if the (installation) directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && joomla_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 - - joomla_log_configured_success_message - - # Install any extensions found in the extensions urls env - if [[ -n "${JOOMLA_EXTENSIONS_URLS}" && "${#JOOMLA_EXTENSIONS_URLS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_URLS" J_E_URLS - for extension_url in "${J_E_URLS[@]}"; do - joomla_install_extension_via_url "$extension_url" - done - fi - - # Install any extensions found in the extensions paths env - if [[ -n "${JOOMLA_EXTENSIONS_PATHS}" && "${#JOOMLA_EXTENSIONS_PATHS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_PATHS" J_E_PATHS - for extension_path in "${J_E_PATHS[@]}"; do - joomla_install_extension_via_path "$extension_path" - done - fi - - if [[ -n "${JOOMLA_SMTP_HOST}" && "${JOOMLA_SMTP_HOST}" == *:* ]]; then - joomla_get_host_port_by_colon "$JOOMLA_SMTP_HOST" JOOMLA_SMTP_HOST JOOMLA_SMTP_HOST_PORT - fi - - # add the smtp host to configuration file - if [[ -n "${JOOMLA_SMTP_HOST}" && "${#JOOMLA_SMTP_HOST}" -gt 2 ]]; then - chmod +w configuration.php - sed -i "s/public \$mailer = 'mail';/public \$mailer = 'smtp';/g" configuration.php - sed -i "s/public \$smtphost = 'localhost';/public \$smtphost = '${JOOMLA_SMTP_HOST}';/g" configuration.php - fi - - # add the smtp port to configuration file - if [[ -n "${JOOMLA_SMTP_HOST_PORT}" ]]; then - sed -i "s/public \$smtpport = 25;/public \$smtpport = ${JOOMLA_SMTP_HOST_PORT};/g" configuration.php - fi - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set the correct ownership of all files touched during installation - if ! chown -R "$user:$group" .; then - joomla_log_error "Ownership of all files touched during installation failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - joomla_log_error "Permissions of configuration.php failed to be corrected." - fi - fi - else - joomla_log_success_and_need_db_message - fi - else - joomla_log_success_and_need_db_message - fi - # end Joomla message block - joomla_echo_line_end -fi - -exec "$@" diff --git a/5.2.rc/php8.1/apache/makedb.php b/5.2.rc/php8.1/apache/makedb.php deleted file mode 100644 index a64d9d3..0000000 --- a/5.2.rc/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} dbname=postgres"; - $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.2.rc/php8.1/fpm-alpine/Dockerfile b/5.2.rc/php8.1/fpm-alpine/Dockerfile deleted file mode 100644 index 3703e5a..0000000 --- a/5.2.rc/php8.1/fpm-alpine/Dockerfile +++ /dev/null @@ -1,165 +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 -# https://github.com/Imagick/imagick/commit/5ae2ecf20a1157073bad0170106ad0cf74e01cb6 (causes a lot of build failures, but strangely only intermittent ones) -# see also https://github.com/Imagick/imagick/pull/641 -# this is "pecl install imagick-3.7.0", but by hand so we can apply a small hack / part of the above commit -# Thanks to @tianon https://github.com/docker-library/wordpress/commit/509adb58cbc7463a03e317931df65868ec8a3e92 - curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \ - echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \ - tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \ - test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \ - sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php && exit 1 || :; \ - docker-php-ext-install /tmp/imagick-3.7.0; \ - rm -rf imagick.tgz /tmp/imagick-3.7.0; \ -# TODO when imagick has another release, we should ditch this whole block and just update instead - \ -# 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.2.0-rc1 -ENV JOOMLA_SHA512 51dd71e8f58eeba4b86bbedcd8235780bdf5db73852261154d1a0f1b057bda4395be03a60b1173f8b82d791739c0ef224e5c203c8989c54d0c2e31b45fd41b00 - -# 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.2.0-rc1/Joomla_5.2.0-rc1-Release_Candidate-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.2.rc/php8.1/fpm-alpine/docker-entrypoint.sh b/5.2.rc/php8.1/fpm-alpine/docker-entrypoint.sh deleted file mode 100755 index 6255d23..0000000 --- a/5.2.rc/php8.1/fpm-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,385 +0,0 @@ -#!/bin/bash -set -e - -# Load database password from file if specified -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -# Function to log messages -joomla_log() { - local msg="$1" - echo >&2 " $msg" -} - -# Function to log info messages -joomla_log_info() { - local msg="$1" - echo >&2 "[INFO] $msg" -} - -# Function to log warning messages -joomla_log_warning() { - local msg="$1" - echo >&2 "[WARNING] $msg" -} - -# Function to log error messages -joomla_log_error() { - local msg="$1" - echo >&2 "[ERROR] $msg" -} - -# Function to set a line -joomla_echo_line() { - echo >&2 "========================================================================" -} - -# Function to set a line at end -joomla_echo_line_start() { - joomla_echo_line - echo >&2 -} - -# Function to set a line at end -joomla_echo_line_end() { - echo >&2 - joomla_echo_line -} - -# Function to give final success message (1) -joomla_log_configured_success_message() { - joomla_log "This server is now configured to run Joomla!" -} - -# Function to give final success message (2) -joomla_log_success_and_need_db_message() { - joomla_log_configured_success_message - echo >&2 - joomla_log " NOTE: You will need your database server address, database name," - joomla_log " and database user credentials to install Joomla." -} - -# Function to validate URLs -joomla_validate_url() { - if [[ $1 =~ ^http(s)?://[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(/.*)?$ ]]; then - return 0 - else - return 1 - fi -} - -# Function to validate file path -joomla_validate_path() { - if [[ -f $1 ]]; then - return 0 - else - return 1 - fi -} - -# Function to split values by semicolon -joomla_get_array_by_semicolon() { - local input=$1 # The input string to be split - local -n arr=$2 # The array to store the split values (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=';' read -ra arr <<< "$input" # Split the input by semicolon and store in array - IFS=$old_IFS # Restore the original IFS value -} - -# Function to split values by colon to get host and port -joomla_get_host_port_by_colon() { - local input=$1 # The input string to be split - local -n hostname=$2 # The variable to store the hostname (passed by reference) - local -n port=$3 # The variable to store the port (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=':' read -r hostname port <<< "$input" # Split the input by colon and store in hostname and port - IFS=$old_IFS # Restore the original IFS value -} - -# Function to install extension from URL -joomla_install_extension_via_url() { - local url=$1 - if joomla_validate_url "$url"; then - if php cli/joomla.php extension:install --url "$url" --no-interaction; then - joomla_log_info "Successfully installed $url" - else - joomla_log_error "Failed to install $url" - fi - else - joomla_log_error "Invalid URL: $url" - fi -} - -# Function to install extension from path -joomla_install_extension_via_path() { - local path=$1 - if joomla_validate_path "$path"; then - if php cli/joomla.php extension:install --path "$path" --no-interaction; then - joomla_log_info "Successfully installed $path" - else - joomla_log_error "Failed to install $path" - fi - else - joomla_log_error "Invalid Path: $path" - fi -} - -# Function to validate necessary environment variables -joomla_validate_vars() { - # Basic email regex for validation - local email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_error "JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - return 0 -} - -# Function to check if auto deploy can be done -joomla_can_auto_deploy() { - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - if joomla_validate_vars; then - return 0 - fi - fi - - return 1 -} - -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 - - # start Joomla message block - joomla_echo_line_start - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - joomla_log_warning "both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - joomla_log "Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - joomla_log "instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - joomla_log_error "Missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables." - joomla_log "Did you forget to --link some_mysql_container:mysql or set an external db" - joomla_log "with -e JOOMLA_DB_HOST=hostname:port?" - # end Joomla message block - joomla_echo_line_end - 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 - joomla_log_error "Missing required JOOMLA_DB_PASSWORD environment variable." - joomla_log "Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - joomla_log "(Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - # end Joomla message block - joomla_echo_line_end - 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 - - joomla_log_info "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - joomla_log_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 - - joomla_log "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}" - - # if the (installation) directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && joomla_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 - - joomla_log_configured_success_message - - # Install any extensions found in the extensions urls env - if [[ -n "${JOOMLA_EXTENSIONS_URLS}" && "${#JOOMLA_EXTENSIONS_URLS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_URLS" J_E_URLS - for extension_url in "${J_E_URLS[@]}"; do - joomla_install_extension_via_url "$extension_url" - done - fi - - # Install any extensions found in the extensions paths env - if [[ -n "${JOOMLA_EXTENSIONS_PATHS}" && "${#JOOMLA_EXTENSIONS_PATHS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_PATHS" J_E_PATHS - for extension_path in "${J_E_PATHS[@]}"; do - joomla_install_extension_via_path "$extension_path" - done - fi - - if [[ -n "${JOOMLA_SMTP_HOST}" && "${JOOMLA_SMTP_HOST}" == *:* ]]; then - joomla_get_host_port_by_colon "$JOOMLA_SMTP_HOST" JOOMLA_SMTP_HOST JOOMLA_SMTP_HOST_PORT - fi - - # add the smtp host to configuration file - if [[ -n "${JOOMLA_SMTP_HOST}" && "${#JOOMLA_SMTP_HOST}" -gt 2 ]]; then - chmod +w configuration.php - sed -i "s/public \$mailer = 'mail';/public \$mailer = 'smtp';/g" configuration.php - sed -i "s/public \$smtphost = 'localhost';/public \$smtphost = '${JOOMLA_SMTP_HOST}';/g" configuration.php - fi - - # add the smtp port to configuration file - if [[ -n "${JOOMLA_SMTP_HOST_PORT}" ]]; then - sed -i "s/public \$smtpport = 25;/public \$smtpport = ${JOOMLA_SMTP_HOST_PORT};/g" configuration.php - fi - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set the correct ownership of all files touched during installation - if ! chown -R "$user:$group" .; then - joomla_log_error "Ownership of all files touched during installation failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - joomla_log_error "Permissions of configuration.php failed to be corrected." - fi - fi - else - joomla_log_success_and_need_db_message - fi - else - joomla_log_success_and_need_db_message - fi - # end Joomla message block - joomla_echo_line_end -fi - -exec "$@" diff --git a/5.2.rc/php8.1/fpm-alpine/makedb.php b/5.2.rc/php8.1/fpm-alpine/makedb.php deleted file mode 100644 index a64d9d3..0000000 --- a/5.2.rc/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} dbname=postgres"; - $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.2.rc/php8.1/fpm/Dockerfile b/5.2.rc/php8.1/fpm/Dockerfile deleted file mode 100644 index 68ce87f..0000000 --- a/5.2.rc/php8.1/fpm/Dockerfile +++ /dev/null @@ -1,167 +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 -# https://github.com/Imagick/imagick/commit/5ae2ecf20a1157073bad0170106ad0cf74e01cb6 (causes a lot of build failures, but strangely only intermittent ones) -# see also https://github.com/Imagick/imagick/pull/641 -# this is "pecl install imagick-3.7.0", but by hand so we can apply a small hack / part of the above commit -# Thanks to @tianon https://github.com/docker-library/wordpress/commit/509adb58cbc7463a03e317931df65868ec8a3e92 - curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \ - echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \ - tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \ - test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \ - sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php && exit 1 || :; \ - docker-php-ext-install /tmp/imagick-3.7.0; \ - rm -rf imagick.tgz /tmp/imagick-3.7.0; \ -# TODO when imagick has another release, we should ditch this whole block and just update instead - \ -# 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.2.0-rc1 -ENV JOOMLA_SHA512 51dd71e8f58eeba4b86bbedcd8235780bdf5db73852261154d1a0f1b057bda4395be03a60b1173f8b82d791739c0ef224e5c203c8989c54d0c2e31b45fd41b00 - -# 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.2.0-rc1/Joomla_5.2.0-rc1-Release_Candidate-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.2.rc/php8.1/fpm/docker-entrypoint.sh b/5.2.rc/php8.1/fpm/docker-entrypoint.sh deleted file mode 100755 index 6255d23..0000000 --- a/5.2.rc/php8.1/fpm/docker-entrypoint.sh +++ /dev/null @@ -1,385 +0,0 @@ -#!/bin/bash -set -e - -# Load database password from file if specified -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -# Function to log messages -joomla_log() { - local msg="$1" - echo >&2 " $msg" -} - -# Function to log info messages -joomla_log_info() { - local msg="$1" - echo >&2 "[INFO] $msg" -} - -# Function to log warning messages -joomla_log_warning() { - local msg="$1" - echo >&2 "[WARNING] $msg" -} - -# Function to log error messages -joomla_log_error() { - local msg="$1" - echo >&2 "[ERROR] $msg" -} - -# Function to set a line -joomla_echo_line() { - echo >&2 "========================================================================" -} - -# Function to set a line at end -joomla_echo_line_start() { - joomla_echo_line - echo >&2 -} - -# Function to set a line at end -joomla_echo_line_end() { - echo >&2 - joomla_echo_line -} - -# Function to give final success message (1) -joomla_log_configured_success_message() { - joomla_log "This server is now configured to run Joomla!" -} - -# Function to give final success message (2) -joomla_log_success_and_need_db_message() { - joomla_log_configured_success_message - echo >&2 - joomla_log " NOTE: You will need your database server address, database name," - joomla_log " and database user credentials to install Joomla." -} - -# Function to validate URLs -joomla_validate_url() { - if [[ $1 =~ ^http(s)?://[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(/.*)?$ ]]; then - return 0 - else - return 1 - fi -} - -# Function to validate file path -joomla_validate_path() { - if [[ -f $1 ]]; then - return 0 - else - return 1 - fi -} - -# Function to split values by semicolon -joomla_get_array_by_semicolon() { - local input=$1 # The input string to be split - local -n arr=$2 # The array to store the split values (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=';' read -ra arr <<< "$input" # Split the input by semicolon and store in array - IFS=$old_IFS # Restore the original IFS value -} - -# Function to split values by colon to get host and port -joomla_get_host_port_by_colon() { - local input=$1 # The input string to be split - local -n hostname=$2 # The variable to store the hostname (passed by reference) - local -n port=$3 # The variable to store the port (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=':' read -r hostname port <<< "$input" # Split the input by colon and store in hostname and port - IFS=$old_IFS # Restore the original IFS value -} - -# Function to install extension from URL -joomla_install_extension_via_url() { - local url=$1 - if joomla_validate_url "$url"; then - if php cli/joomla.php extension:install --url "$url" --no-interaction; then - joomla_log_info "Successfully installed $url" - else - joomla_log_error "Failed to install $url" - fi - else - joomla_log_error "Invalid URL: $url" - fi -} - -# Function to install extension from path -joomla_install_extension_via_path() { - local path=$1 - if joomla_validate_path "$path"; then - if php cli/joomla.php extension:install --path "$path" --no-interaction; then - joomla_log_info "Successfully installed $path" - else - joomla_log_error "Failed to install $path" - fi - else - joomla_log_error "Invalid Path: $path" - fi -} - -# Function to validate necessary environment variables -joomla_validate_vars() { - # Basic email regex for validation - local email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_error "JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - return 0 -} - -# Function to check if auto deploy can be done -joomla_can_auto_deploy() { - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - if joomla_validate_vars; then - return 0 - fi - fi - - return 1 -} - -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 - - # start Joomla message block - joomla_echo_line_start - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - joomla_log_warning "both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - joomla_log "Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - joomla_log "instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - joomla_log_error "Missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables." - joomla_log "Did you forget to --link some_mysql_container:mysql or set an external db" - joomla_log "with -e JOOMLA_DB_HOST=hostname:port?" - # end Joomla message block - joomla_echo_line_end - 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 - joomla_log_error "Missing required JOOMLA_DB_PASSWORD environment variable." - joomla_log "Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - joomla_log "(Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - # end Joomla message block - joomla_echo_line_end - 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 - - joomla_log_info "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - joomla_log_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 - - joomla_log "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}" - - # if the (installation) directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && joomla_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 - - joomla_log_configured_success_message - - # Install any extensions found in the extensions urls env - if [[ -n "${JOOMLA_EXTENSIONS_URLS}" && "${#JOOMLA_EXTENSIONS_URLS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_URLS" J_E_URLS - for extension_url in "${J_E_URLS[@]}"; do - joomla_install_extension_via_url "$extension_url" - done - fi - - # Install any extensions found in the extensions paths env - if [[ -n "${JOOMLA_EXTENSIONS_PATHS}" && "${#JOOMLA_EXTENSIONS_PATHS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_PATHS" J_E_PATHS - for extension_path in "${J_E_PATHS[@]}"; do - joomla_install_extension_via_path "$extension_path" - done - fi - - if [[ -n "${JOOMLA_SMTP_HOST}" && "${JOOMLA_SMTP_HOST}" == *:* ]]; then - joomla_get_host_port_by_colon "$JOOMLA_SMTP_HOST" JOOMLA_SMTP_HOST JOOMLA_SMTP_HOST_PORT - fi - - # add the smtp host to configuration file - if [[ -n "${JOOMLA_SMTP_HOST}" && "${#JOOMLA_SMTP_HOST}" -gt 2 ]]; then - chmod +w configuration.php - sed -i "s/public \$mailer = 'mail';/public \$mailer = 'smtp';/g" configuration.php - sed -i "s/public \$smtphost = 'localhost';/public \$smtphost = '${JOOMLA_SMTP_HOST}';/g" configuration.php - fi - - # add the smtp port to configuration file - if [[ -n "${JOOMLA_SMTP_HOST_PORT}" ]]; then - sed -i "s/public \$smtpport = 25;/public \$smtpport = ${JOOMLA_SMTP_HOST_PORT};/g" configuration.php - fi - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set the correct ownership of all files touched during installation - if ! chown -R "$user:$group" .; then - joomla_log_error "Ownership of all files touched during installation failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - joomla_log_error "Permissions of configuration.php failed to be corrected." - fi - fi - else - joomla_log_success_and_need_db_message - fi - else - joomla_log_success_and_need_db_message - fi - # end Joomla message block - joomla_echo_line_end -fi - -exec "$@" diff --git a/5.2.rc/php8.1/fpm/makedb.php b/5.2.rc/php8.1/fpm/makedb.php deleted file mode 100644 index a64d9d3..0000000 --- a/5.2.rc/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} dbname=postgres"; - $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.2.rc/php8.2/apache/Dockerfile b/5.2.rc/php8.2/apache/Dockerfile deleted file mode 100644 index 5cc3545..0000000 --- a/5.2.rc/php8.2/apache/Dockerfile +++ /dev/null @@ -1,184 +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 -# https://github.com/Imagick/imagick/commit/5ae2ecf20a1157073bad0170106ad0cf74e01cb6 (causes a lot of build failures, but strangely only intermittent ones) -# see also https://github.com/Imagick/imagick/pull/641 -# this is "pecl install imagick-3.7.0", but by hand so we can apply a small hack / part of the above commit -# Thanks to @tianon https://github.com/docker-library/wordpress/commit/509adb58cbc7463a03e317931df65868ec8a3e92 - curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \ - echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \ - tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \ - test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \ - sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php && exit 1 || :; \ - docker-php-ext-install /tmp/imagick-3.7.0; \ - rm -rf imagick.tgz /tmp/imagick-3.7.0; \ -# TODO when imagick has another release, we should ditch this whole block and just update instead - \ -# 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.2.0-rc1 -ENV JOOMLA_SHA512 51dd71e8f58eeba4b86bbedcd8235780bdf5db73852261154d1a0f1b057bda4395be03a60b1173f8b82d791739c0ef224e5c203c8989c54d0c2e31b45fd41b00 - -# 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.2.0-rc1/Joomla_5.2.0-rc1-Release_Candidate-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.2.rc/php8.2/apache/docker-entrypoint.sh b/5.2.rc/php8.2/apache/docker-entrypoint.sh deleted file mode 100755 index 6255d23..0000000 --- a/5.2.rc/php8.2/apache/docker-entrypoint.sh +++ /dev/null @@ -1,385 +0,0 @@ -#!/bin/bash -set -e - -# Load database password from file if specified -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -# Function to log messages -joomla_log() { - local msg="$1" - echo >&2 " $msg" -} - -# Function to log info messages -joomla_log_info() { - local msg="$1" - echo >&2 "[INFO] $msg" -} - -# Function to log warning messages -joomla_log_warning() { - local msg="$1" - echo >&2 "[WARNING] $msg" -} - -# Function to log error messages -joomla_log_error() { - local msg="$1" - echo >&2 "[ERROR] $msg" -} - -# Function to set a line -joomla_echo_line() { - echo >&2 "========================================================================" -} - -# Function to set a line at end -joomla_echo_line_start() { - joomla_echo_line - echo >&2 -} - -# Function to set a line at end -joomla_echo_line_end() { - echo >&2 - joomla_echo_line -} - -# Function to give final success message (1) -joomla_log_configured_success_message() { - joomla_log "This server is now configured to run Joomla!" -} - -# Function to give final success message (2) -joomla_log_success_and_need_db_message() { - joomla_log_configured_success_message - echo >&2 - joomla_log " NOTE: You will need your database server address, database name," - joomla_log " and database user credentials to install Joomla." -} - -# Function to validate URLs -joomla_validate_url() { - if [[ $1 =~ ^http(s)?://[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(/.*)?$ ]]; then - return 0 - else - return 1 - fi -} - -# Function to validate file path -joomla_validate_path() { - if [[ -f $1 ]]; then - return 0 - else - return 1 - fi -} - -# Function to split values by semicolon -joomla_get_array_by_semicolon() { - local input=$1 # The input string to be split - local -n arr=$2 # The array to store the split values (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=';' read -ra arr <<< "$input" # Split the input by semicolon and store in array - IFS=$old_IFS # Restore the original IFS value -} - -# Function to split values by colon to get host and port -joomla_get_host_port_by_colon() { - local input=$1 # The input string to be split - local -n hostname=$2 # The variable to store the hostname (passed by reference) - local -n port=$3 # The variable to store the port (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=':' read -r hostname port <<< "$input" # Split the input by colon and store in hostname and port - IFS=$old_IFS # Restore the original IFS value -} - -# Function to install extension from URL -joomla_install_extension_via_url() { - local url=$1 - if joomla_validate_url "$url"; then - if php cli/joomla.php extension:install --url "$url" --no-interaction; then - joomla_log_info "Successfully installed $url" - else - joomla_log_error "Failed to install $url" - fi - else - joomla_log_error "Invalid URL: $url" - fi -} - -# Function to install extension from path -joomla_install_extension_via_path() { - local path=$1 - if joomla_validate_path "$path"; then - if php cli/joomla.php extension:install --path "$path" --no-interaction; then - joomla_log_info "Successfully installed $path" - else - joomla_log_error "Failed to install $path" - fi - else - joomla_log_error "Invalid Path: $path" - fi -} - -# Function to validate necessary environment variables -joomla_validate_vars() { - # Basic email regex for validation - local email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_error "JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - return 0 -} - -# Function to check if auto deploy can be done -joomla_can_auto_deploy() { - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - if joomla_validate_vars; then - return 0 - fi - fi - - return 1 -} - -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 - - # start Joomla message block - joomla_echo_line_start - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - joomla_log_warning "both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - joomla_log "Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - joomla_log "instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - joomla_log_error "Missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables." - joomla_log "Did you forget to --link some_mysql_container:mysql or set an external db" - joomla_log "with -e JOOMLA_DB_HOST=hostname:port?" - # end Joomla message block - joomla_echo_line_end - 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 - joomla_log_error "Missing required JOOMLA_DB_PASSWORD environment variable." - joomla_log "Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - joomla_log "(Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - # end Joomla message block - joomla_echo_line_end - 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 - - joomla_log_info "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - joomla_log_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 - - joomla_log "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}" - - # if the (installation) directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && joomla_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 - - joomla_log_configured_success_message - - # Install any extensions found in the extensions urls env - if [[ -n "${JOOMLA_EXTENSIONS_URLS}" && "${#JOOMLA_EXTENSIONS_URLS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_URLS" J_E_URLS - for extension_url in "${J_E_URLS[@]}"; do - joomla_install_extension_via_url "$extension_url" - done - fi - - # Install any extensions found in the extensions paths env - if [[ -n "${JOOMLA_EXTENSIONS_PATHS}" && "${#JOOMLA_EXTENSIONS_PATHS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_PATHS" J_E_PATHS - for extension_path in "${J_E_PATHS[@]}"; do - joomla_install_extension_via_path "$extension_path" - done - fi - - if [[ -n "${JOOMLA_SMTP_HOST}" && "${JOOMLA_SMTP_HOST}" == *:* ]]; then - joomla_get_host_port_by_colon "$JOOMLA_SMTP_HOST" JOOMLA_SMTP_HOST JOOMLA_SMTP_HOST_PORT - fi - - # add the smtp host to configuration file - if [[ -n "${JOOMLA_SMTP_HOST}" && "${#JOOMLA_SMTP_HOST}" -gt 2 ]]; then - chmod +w configuration.php - sed -i "s/public \$mailer = 'mail';/public \$mailer = 'smtp';/g" configuration.php - sed -i "s/public \$smtphost = 'localhost';/public \$smtphost = '${JOOMLA_SMTP_HOST}';/g" configuration.php - fi - - # add the smtp port to configuration file - if [[ -n "${JOOMLA_SMTP_HOST_PORT}" ]]; then - sed -i "s/public \$smtpport = 25;/public \$smtpport = ${JOOMLA_SMTP_HOST_PORT};/g" configuration.php - fi - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set the correct ownership of all files touched during installation - if ! chown -R "$user:$group" .; then - joomla_log_error "Ownership of all files touched during installation failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - joomla_log_error "Permissions of configuration.php failed to be corrected." - fi - fi - else - joomla_log_success_and_need_db_message - fi - else - joomla_log_success_and_need_db_message - fi - # end Joomla message block - joomla_echo_line_end -fi - -exec "$@" diff --git a/5.2.rc/php8.2/apache/makedb.php b/5.2.rc/php8.2/apache/makedb.php deleted file mode 100644 index a64d9d3..0000000 --- a/5.2.rc/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} dbname=postgres"; - $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.2.rc/php8.2/fpm-alpine/Dockerfile b/5.2.rc/php8.2/fpm-alpine/Dockerfile deleted file mode 100644 index bc72166..0000000 --- a/5.2.rc/php8.2/fpm-alpine/Dockerfile +++ /dev/null @@ -1,165 +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 -# https://github.com/Imagick/imagick/commit/5ae2ecf20a1157073bad0170106ad0cf74e01cb6 (causes a lot of build failures, but strangely only intermittent ones) -# see also https://github.com/Imagick/imagick/pull/641 -# this is "pecl install imagick-3.7.0", but by hand so we can apply a small hack / part of the above commit -# Thanks to @tianon https://github.com/docker-library/wordpress/commit/509adb58cbc7463a03e317931df65868ec8a3e92 - curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \ - echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \ - tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \ - test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \ - sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php && exit 1 || :; \ - docker-php-ext-install /tmp/imagick-3.7.0; \ - rm -rf imagick.tgz /tmp/imagick-3.7.0; \ -# TODO when imagick has another release, we should ditch this whole block and just update instead - \ -# 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.2.0-rc1 -ENV JOOMLA_SHA512 51dd71e8f58eeba4b86bbedcd8235780bdf5db73852261154d1a0f1b057bda4395be03a60b1173f8b82d791739c0ef224e5c203c8989c54d0c2e31b45fd41b00 - -# 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.2.0-rc1/Joomla_5.2.0-rc1-Release_Candidate-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.2.rc/php8.2/fpm-alpine/docker-entrypoint.sh b/5.2.rc/php8.2/fpm-alpine/docker-entrypoint.sh deleted file mode 100755 index 6255d23..0000000 --- a/5.2.rc/php8.2/fpm-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,385 +0,0 @@ -#!/bin/bash -set -e - -# Load database password from file if specified -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -# Function to log messages -joomla_log() { - local msg="$1" - echo >&2 " $msg" -} - -# Function to log info messages -joomla_log_info() { - local msg="$1" - echo >&2 "[INFO] $msg" -} - -# Function to log warning messages -joomla_log_warning() { - local msg="$1" - echo >&2 "[WARNING] $msg" -} - -# Function to log error messages -joomla_log_error() { - local msg="$1" - echo >&2 "[ERROR] $msg" -} - -# Function to set a line -joomla_echo_line() { - echo >&2 "========================================================================" -} - -# Function to set a line at end -joomla_echo_line_start() { - joomla_echo_line - echo >&2 -} - -# Function to set a line at end -joomla_echo_line_end() { - echo >&2 - joomla_echo_line -} - -# Function to give final success message (1) -joomla_log_configured_success_message() { - joomla_log "This server is now configured to run Joomla!" -} - -# Function to give final success message (2) -joomla_log_success_and_need_db_message() { - joomla_log_configured_success_message - echo >&2 - joomla_log " NOTE: You will need your database server address, database name," - joomla_log " and database user credentials to install Joomla." -} - -# Function to validate URLs -joomla_validate_url() { - if [[ $1 =~ ^http(s)?://[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(/.*)?$ ]]; then - return 0 - else - return 1 - fi -} - -# Function to validate file path -joomla_validate_path() { - if [[ -f $1 ]]; then - return 0 - else - return 1 - fi -} - -# Function to split values by semicolon -joomla_get_array_by_semicolon() { - local input=$1 # The input string to be split - local -n arr=$2 # The array to store the split values (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=';' read -ra arr <<< "$input" # Split the input by semicolon and store in array - IFS=$old_IFS # Restore the original IFS value -} - -# Function to split values by colon to get host and port -joomla_get_host_port_by_colon() { - local input=$1 # The input string to be split - local -n hostname=$2 # The variable to store the hostname (passed by reference) - local -n port=$3 # The variable to store the port (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=':' read -r hostname port <<< "$input" # Split the input by colon and store in hostname and port - IFS=$old_IFS # Restore the original IFS value -} - -# Function to install extension from URL -joomla_install_extension_via_url() { - local url=$1 - if joomla_validate_url "$url"; then - if php cli/joomla.php extension:install --url "$url" --no-interaction; then - joomla_log_info "Successfully installed $url" - else - joomla_log_error "Failed to install $url" - fi - else - joomla_log_error "Invalid URL: $url" - fi -} - -# Function to install extension from path -joomla_install_extension_via_path() { - local path=$1 - if joomla_validate_path "$path"; then - if php cli/joomla.php extension:install --path "$path" --no-interaction; then - joomla_log_info "Successfully installed $path" - else - joomla_log_error "Failed to install $path" - fi - else - joomla_log_error "Invalid Path: $path" - fi -} - -# Function to validate necessary environment variables -joomla_validate_vars() { - # Basic email regex for validation - local email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_error "JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - return 0 -} - -# Function to check if auto deploy can be done -joomla_can_auto_deploy() { - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - if joomla_validate_vars; then - return 0 - fi - fi - - return 1 -} - -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 - - # start Joomla message block - joomla_echo_line_start - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - joomla_log_warning "both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - joomla_log "Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - joomla_log "instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - joomla_log_error "Missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables." - joomla_log "Did you forget to --link some_mysql_container:mysql or set an external db" - joomla_log "with -e JOOMLA_DB_HOST=hostname:port?" - # end Joomla message block - joomla_echo_line_end - 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 - joomla_log_error "Missing required JOOMLA_DB_PASSWORD environment variable." - joomla_log "Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - joomla_log "(Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - # end Joomla message block - joomla_echo_line_end - 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 - - joomla_log_info "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - joomla_log_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 - - joomla_log "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}" - - # if the (installation) directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && joomla_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 - - joomla_log_configured_success_message - - # Install any extensions found in the extensions urls env - if [[ -n "${JOOMLA_EXTENSIONS_URLS}" && "${#JOOMLA_EXTENSIONS_URLS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_URLS" J_E_URLS - for extension_url in "${J_E_URLS[@]}"; do - joomla_install_extension_via_url "$extension_url" - done - fi - - # Install any extensions found in the extensions paths env - if [[ -n "${JOOMLA_EXTENSIONS_PATHS}" && "${#JOOMLA_EXTENSIONS_PATHS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_PATHS" J_E_PATHS - for extension_path in "${J_E_PATHS[@]}"; do - joomla_install_extension_via_path "$extension_path" - done - fi - - if [[ -n "${JOOMLA_SMTP_HOST}" && "${JOOMLA_SMTP_HOST}" == *:* ]]; then - joomla_get_host_port_by_colon "$JOOMLA_SMTP_HOST" JOOMLA_SMTP_HOST JOOMLA_SMTP_HOST_PORT - fi - - # add the smtp host to configuration file - if [[ -n "${JOOMLA_SMTP_HOST}" && "${#JOOMLA_SMTP_HOST}" -gt 2 ]]; then - chmod +w configuration.php - sed -i "s/public \$mailer = 'mail';/public \$mailer = 'smtp';/g" configuration.php - sed -i "s/public \$smtphost = 'localhost';/public \$smtphost = '${JOOMLA_SMTP_HOST}';/g" configuration.php - fi - - # add the smtp port to configuration file - if [[ -n "${JOOMLA_SMTP_HOST_PORT}" ]]; then - sed -i "s/public \$smtpport = 25;/public \$smtpport = ${JOOMLA_SMTP_HOST_PORT};/g" configuration.php - fi - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set the correct ownership of all files touched during installation - if ! chown -R "$user:$group" .; then - joomla_log_error "Ownership of all files touched during installation failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - joomla_log_error "Permissions of configuration.php failed to be corrected." - fi - fi - else - joomla_log_success_and_need_db_message - fi - else - joomla_log_success_and_need_db_message - fi - # end Joomla message block - joomla_echo_line_end -fi - -exec "$@" diff --git a/5.2.rc/php8.2/fpm-alpine/makedb.php b/5.2.rc/php8.2/fpm-alpine/makedb.php deleted file mode 100644 index a64d9d3..0000000 --- a/5.2.rc/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} dbname=postgres"; - $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.2.rc/php8.2/fpm/Dockerfile b/5.2.rc/php8.2/fpm/Dockerfile deleted file mode 100644 index 59c8fbe..0000000 --- a/5.2.rc/php8.2/fpm/Dockerfile +++ /dev/null @@ -1,167 +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 -# https://github.com/Imagick/imagick/commit/5ae2ecf20a1157073bad0170106ad0cf74e01cb6 (causes a lot of build failures, but strangely only intermittent ones) -# see also https://github.com/Imagick/imagick/pull/641 -# this is "pecl install imagick-3.7.0", but by hand so we can apply a small hack / part of the above commit -# Thanks to @tianon https://github.com/docker-library/wordpress/commit/509adb58cbc7463a03e317931df65868ec8a3e92 - curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \ - echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \ - tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \ - test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \ - sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php && exit 1 || :; \ - docker-php-ext-install /tmp/imagick-3.7.0; \ - rm -rf imagick.tgz /tmp/imagick-3.7.0; \ -# TODO when imagick has another release, we should ditch this whole block and just update instead - \ -# 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.2.0-rc1 -ENV JOOMLA_SHA512 51dd71e8f58eeba4b86bbedcd8235780bdf5db73852261154d1a0f1b057bda4395be03a60b1173f8b82d791739c0ef224e5c203c8989c54d0c2e31b45fd41b00 - -# 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.2.0-rc1/Joomla_5.2.0-rc1-Release_Candidate-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.2.rc/php8.2/fpm/docker-entrypoint.sh b/5.2.rc/php8.2/fpm/docker-entrypoint.sh deleted file mode 100755 index 6255d23..0000000 --- a/5.2.rc/php8.2/fpm/docker-entrypoint.sh +++ /dev/null @@ -1,385 +0,0 @@ -#!/bin/bash -set -e - -# Load database password from file if specified -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -# Function to log messages -joomla_log() { - local msg="$1" - echo >&2 " $msg" -} - -# Function to log info messages -joomla_log_info() { - local msg="$1" - echo >&2 "[INFO] $msg" -} - -# Function to log warning messages -joomla_log_warning() { - local msg="$1" - echo >&2 "[WARNING] $msg" -} - -# Function to log error messages -joomla_log_error() { - local msg="$1" - echo >&2 "[ERROR] $msg" -} - -# Function to set a line -joomla_echo_line() { - echo >&2 "========================================================================" -} - -# Function to set a line at end -joomla_echo_line_start() { - joomla_echo_line - echo >&2 -} - -# Function to set a line at end -joomla_echo_line_end() { - echo >&2 - joomla_echo_line -} - -# Function to give final success message (1) -joomla_log_configured_success_message() { - joomla_log "This server is now configured to run Joomla!" -} - -# Function to give final success message (2) -joomla_log_success_and_need_db_message() { - joomla_log_configured_success_message - echo >&2 - joomla_log " NOTE: You will need your database server address, database name," - joomla_log " and database user credentials to install Joomla." -} - -# Function to validate URLs -joomla_validate_url() { - if [[ $1 =~ ^http(s)?://[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(/.*)?$ ]]; then - return 0 - else - return 1 - fi -} - -# Function to validate file path -joomla_validate_path() { - if [[ -f $1 ]]; then - return 0 - else - return 1 - fi -} - -# Function to split values by semicolon -joomla_get_array_by_semicolon() { - local input=$1 # The input string to be split - local -n arr=$2 # The array to store the split values (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=';' read -ra arr <<< "$input" # Split the input by semicolon and store in array - IFS=$old_IFS # Restore the original IFS value -} - -# Function to split values by colon to get host and port -joomla_get_host_port_by_colon() { - local input=$1 # The input string to be split - local -n hostname=$2 # The variable to store the hostname (passed by reference) - local -n port=$3 # The variable to store the port (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=':' read -r hostname port <<< "$input" # Split the input by colon and store in hostname and port - IFS=$old_IFS # Restore the original IFS value -} - -# Function to install extension from URL -joomla_install_extension_via_url() { - local url=$1 - if joomla_validate_url "$url"; then - if php cli/joomla.php extension:install --url "$url" --no-interaction; then - joomla_log_info "Successfully installed $url" - else - joomla_log_error "Failed to install $url" - fi - else - joomla_log_error "Invalid URL: $url" - fi -} - -# Function to install extension from path -joomla_install_extension_via_path() { - local path=$1 - if joomla_validate_path "$path"; then - if php cli/joomla.php extension:install --path "$path" --no-interaction; then - joomla_log_info "Successfully installed $path" - else - joomla_log_error "Failed to install $path" - fi - else - joomla_log_error "Invalid Path: $path" - fi -} - -# Function to validate necessary environment variables -joomla_validate_vars() { - # Basic email regex for validation - local email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_error "JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - return 0 -} - -# Function to check if auto deploy can be done -joomla_can_auto_deploy() { - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - if joomla_validate_vars; then - return 0 - fi - fi - - return 1 -} - -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 - - # start Joomla message block - joomla_echo_line_start - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - joomla_log_warning "both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - joomla_log "Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - joomla_log "instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - joomla_log_error "Missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables." - joomla_log "Did you forget to --link some_mysql_container:mysql or set an external db" - joomla_log "with -e JOOMLA_DB_HOST=hostname:port?" - # end Joomla message block - joomla_echo_line_end - 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 - joomla_log_error "Missing required JOOMLA_DB_PASSWORD environment variable." - joomla_log "Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - joomla_log "(Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - # end Joomla message block - joomla_echo_line_end - 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 - - joomla_log_info "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - joomla_log_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 - - joomla_log "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}" - - # if the (installation) directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && joomla_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 - - joomla_log_configured_success_message - - # Install any extensions found in the extensions urls env - if [[ -n "${JOOMLA_EXTENSIONS_URLS}" && "${#JOOMLA_EXTENSIONS_URLS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_URLS" J_E_URLS - for extension_url in "${J_E_URLS[@]}"; do - joomla_install_extension_via_url "$extension_url" - done - fi - - # Install any extensions found in the extensions paths env - if [[ -n "${JOOMLA_EXTENSIONS_PATHS}" && "${#JOOMLA_EXTENSIONS_PATHS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_PATHS" J_E_PATHS - for extension_path in "${J_E_PATHS[@]}"; do - joomla_install_extension_via_path "$extension_path" - done - fi - - if [[ -n "${JOOMLA_SMTP_HOST}" && "${JOOMLA_SMTP_HOST}" == *:* ]]; then - joomla_get_host_port_by_colon "$JOOMLA_SMTP_HOST" JOOMLA_SMTP_HOST JOOMLA_SMTP_HOST_PORT - fi - - # add the smtp host to configuration file - if [[ -n "${JOOMLA_SMTP_HOST}" && "${#JOOMLA_SMTP_HOST}" -gt 2 ]]; then - chmod +w configuration.php - sed -i "s/public \$mailer = 'mail';/public \$mailer = 'smtp';/g" configuration.php - sed -i "s/public \$smtphost = 'localhost';/public \$smtphost = '${JOOMLA_SMTP_HOST}';/g" configuration.php - fi - - # add the smtp port to configuration file - if [[ -n "${JOOMLA_SMTP_HOST_PORT}" ]]; then - sed -i "s/public \$smtpport = 25;/public \$smtpport = ${JOOMLA_SMTP_HOST_PORT};/g" configuration.php - fi - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set the correct ownership of all files touched during installation - if ! chown -R "$user:$group" .; then - joomla_log_error "Ownership of all files touched during installation failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - joomla_log_error "Permissions of configuration.php failed to be corrected." - fi - fi - else - joomla_log_success_and_need_db_message - fi - else - joomla_log_success_and_need_db_message - fi - # end Joomla message block - joomla_echo_line_end -fi - -exec "$@" diff --git a/5.2.rc/php8.2/fpm/makedb.php b/5.2.rc/php8.2/fpm/makedb.php deleted file mode 100644 index a64d9d3..0000000 --- a/5.2.rc/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} dbname=postgres"; - $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.2.rc/php8.3/apache/Dockerfile b/5.2.rc/php8.3/apache/Dockerfile deleted file mode 100644 index 57a6674..0000000 --- a/5.2.rc/php8.3/apache/Dockerfile +++ /dev/null @@ -1,184 +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.3-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 -# https://github.com/Imagick/imagick/commit/5ae2ecf20a1157073bad0170106ad0cf74e01cb6 (causes a lot of build failures, but strangely only intermittent ones) -# see also https://github.com/Imagick/imagick/pull/641 -# this is "pecl install imagick-3.7.0", but by hand so we can apply a small hack / part of the above commit -# Thanks to @tianon https://github.com/docker-library/wordpress/commit/509adb58cbc7463a03e317931df65868ec8a3e92 - curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \ - echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \ - tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \ - test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \ - sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php && exit 1 || :; \ - docker-php-ext-install /tmp/imagick-3.7.0; \ - rm -rf imagick.tgz /tmp/imagick-3.7.0; \ -# TODO when imagick has another release, we should ditch this whole block and just update instead - \ -# 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.2.0-rc1 -ENV JOOMLA_SHA512 51dd71e8f58eeba4b86bbedcd8235780bdf5db73852261154d1a0f1b057bda4395be03a60b1173f8b82d791739c0ef224e5c203c8989c54d0c2e31b45fd41b00 - -# 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.2.0-rc1/Joomla_5.2.0-rc1-Release_Candidate-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.2.rc/php8.3/apache/docker-entrypoint.sh b/5.2.rc/php8.3/apache/docker-entrypoint.sh deleted file mode 100755 index 6255d23..0000000 --- a/5.2.rc/php8.3/apache/docker-entrypoint.sh +++ /dev/null @@ -1,385 +0,0 @@ -#!/bin/bash -set -e - -# Load database password from file if specified -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -# Function to log messages -joomla_log() { - local msg="$1" - echo >&2 " $msg" -} - -# Function to log info messages -joomla_log_info() { - local msg="$1" - echo >&2 "[INFO] $msg" -} - -# Function to log warning messages -joomla_log_warning() { - local msg="$1" - echo >&2 "[WARNING] $msg" -} - -# Function to log error messages -joomla_log_error() { - local msg="$1" - echo >&2 "[ERROR] $msg" -} - -# Function to set a line -joomla_echo_line() { - echo >&2 "========================================================================" -} - -# Function to set a line at end -joomla_echo_line_start() { - joomla_echo_line - echo >&2 -} - -# Function to set a line at end -joomla_echo_line_end() { - echo >&2 - joomla_echo_line -} - -# Function to give final success message (1) -joomla_log_configured_success_message() { - joomla_log "This server is now configured to run Joomla!" -} - -# Function to give final success message (2) -joomla_log_success_and_need_db_message() { - joomla_log_configured_success_message - echo >&2 - joomla_log " NOTE: You will need your database server address, database name," - joomla_log " and database user credentials to install Joomla." -} - -# Function to validate URLs -joomla_validate_url() { - if [[ $1 =~ ^http(s)?://[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(/.*)?$ ]]; then - return 0 - else - return 1 - fi -} - -# Function to validate file path -joomla_validate_path() { - if [[ -f $1 ]]; then - return 0 - else - return 1 - fi -} - -# Function to split values by semicolon -joomla_get_array_by_semicolon() { - local input=$1 # The input string to be split - local -n arr=$2 # The array to store the split values (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=';' read -ra arr <<< "$input" # Split the input by semicolon and store in array - IFS=$old_IFS # Restore the original IFS value -} - -# Function to split values by colon to get host and port -joomla_get_host_port_by_colon() { - local input=$1 # The input string to be split - local -n hostname=$2 # The variable to store the hostname (passed by reference) - local -n port=$3 # The variable to store the port (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=':' read -r hostname port <<< "$input" # Split the input by colon and store in hostname and port - IFS=$old_IFS # Restore the original IFS value -} - -# Function to install extension from URL -joomla_install_extension_via_url() { - local url=$1 - if joomla_validate_url "$url"; then - if php cli/joomla.php extension:install --url "$url" --no-interaction; then - joomla_log_info "Successfully installed $url" - else - joomla_log_error "Failed to install $url" - fi - else - joomla_log_error "Invalid URL: $url" - fi -} - -# Function to install extension from path -joomla_install_extension_via_path() { - local path=$1 - if joomla_validate_path "$path"; then - if php cli/joomla.php extension:install --path "$path" --no-interaction; then - joomla_log_info "Successfully installed $path" - else - joomla_log_error "Failed to install $path" - fi - else - joomla_log_error "Invalid Path: $path" - fi -} - -# Function to validate necessary environment variables -joomla_validate_vars() { - # Basic email regex for validation - local email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_error "JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - return 0 -} - -# Function to check if auto deploy can be done -joomla_can_auto_deploy() { - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - if joomla_validate_vars; then - return 0 - fi - fi - - return 1 -} - -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 - - # start Joomla message block - joomla_echo_line_start - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - joomla_log_warning "both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - joomla_log "Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - joomla_log "instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - joomla_log_error "Missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables." - joomla_log "Did you forget to --link some_mysql_container:mysql or set an external db" - joomla_log "with -e JOOMLA_DB_HOST=hostname:port?" - # end Joomla message block - joomla_echo_line_end - 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 - joomla_log_error "Missing required JOOMLA_DB_PASSWORD environment variable." - joomla_log "Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - joomla_log "(Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - # end Joomla message block - joomla_echo_line_end - 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 - - joomla_log_info "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - joomla_log_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 - - joomla_log "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}" - - # if the (installation) directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && joomla_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 - - joomla_log_configured_success_message - - # Install any extensions found in the extensions urls env - if [[ -n "${JOOMLA_EXTENSIONS_URLS}" && "${#JOOMLA_EXTENSIONS_URLS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_URLS" J_E_URLS - for extension_url in "${J_E_URLS[@]}"; do - joomla_install_extension_via_url "$extension_url" - done - fi - - # Install any extensions found in the extensions paths env - if [[ -n "${JOOMLA_EXTENSIONS_PATHS}" && "${#JOOMLA_EXTENSIONS_PATHS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_PATHS" J_E_PATHS - for extension_path in "${J_E_PATHS[@]}"; do - joomla_install_extension_via_path "$extension_path" - done - fi - - if [[ -n "${JOOMLA_SMTP_HOST}" && "${JOOMLA_SMTP_HOST}" == *:* ]]; then - joomla_get_host_port_by_colon "$JOOMLA_SMTP_HOST" JOOMLA_SMTP_HOST JOOMLA_SMTP_HOST_PORT - fi - - # add the smtp host to configuration file - if [[ -n "${JOOMLA_SMTP_HOST}" && "${#JOOMLA_SMTP_HOST}" -gt 2 ]]; then - chmod +w configuration.php - sed -i "s/public \$mailer = 'mail';/public \$mailer = 'smtp';/g" configuration.php - sed -i "s/public \$smtphost = 'localhost';/public \$smtphost = '${JOOMLA_SMTP_HOST}';/g" configuration.php - fi - - # add the smtp port to configuration file - if [[ -n "${JOOMLA_SMTP_HOST_PORT}" ]]; then - sed -i "s/public \$smtpport = 25;/public \$smtpport = ${JOOMLA_SMTP_HOST_PORT};/g" configuration.php - fi - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set the correct ownership of all files touched during installation - if ! chown -R "$user:$group" .; then - joomla_log_error "Ownership of all files touched during installation failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - joomla_log_error "Permissions of configuration.php failed to be corrected." - fi - fi - else - joomla_log_success_and_need_db_message - fi - else - joomla_log_success_and_need_db_message - fi - # end Joomla message block - joomla_echo_line_end -fi - -exec "$@" diff --git a/5.2.rc/php8.3/apache/makedb.php b/5.2.rc/php8.3/apache/makedb.php deleted file mode 100644 index a64d9d3..0000000 --- a/5.2.rc/php8.3/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} dbname=postgres"; - $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.2.rc/php8.3/fpm-alpine/Dockerfile b/5.2.rc/php8.3/fpm-alpine/Dockerfile deleted file mode 100644 index 142cc57..0000000 --- a/5.2.rc/php8.3/fpm-alpine/Dockerfile +++ /dev/null @@ -1,165 +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.3-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 -# https://github.com/Imagick/imagick/commit/5ae2ecf20a1157073bad0170106ad0cf74e01cb6 (causes a lot of build failures, but strangely only intermittent ones) -# see also https://github.com/Imagick/imagick/pull/641 -# this is "pecl install imagick-3.7.0", but by hand so we can apply a small hack / part of the above commit -# Thanks to @tianon https://github.com/docker-library/wordpress/commit/509adb58cbc7463a03e317931df65868ec8a3e92 - curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \ - echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \ - tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \ - test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \ - sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php && exit 1 || :; \ - docker-php-ext-install /tmp/imagick-3.7.0; \ - rm -rf imagick.tgz /tmp/imagick-3.7.0; \ -# TODO when imagick has another release, we should ditch this whole block and just update instead - \ -# 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.2.0-rc1 -ENV JOOMLA_SHA512 51dd71e8f58eeba4b86bbedcd8235780bdf5db73852261154d1a0f1b057bda4395be03a60b1173f8b82d791739c0ef224e5c203c8989c54d0c2e31b45fd41b00 - -# 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.2.0-rc1/Joomla_5.2.0-rc1-Release_Candidate-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.2.rc/php8.3/fpm-alpine/docker-entrypoint.sh b/5.2.rc/php8.3/fpm-alpine/docker-entrypoint.sh deleted file mode 100755 index 6255d23..0000000 --- a/5.2.rc/php8.3/fpm-alpine/docker-entrypoint.sh +++ /dev/null @@ -1,385 +0,0 @@ -#!/bin/bash -set -e - -# Load database password from file if specified -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -# Function to log messages -joomla_log() { - local msg="$1" - echo >&2 " $msg" -} - -# Function to log info messages -joomla_log_info() { - local msg="$1" - echo >&2 "[INFO] $msg" -} - -# Function to log warning messages -joomla_log_warning() { - local msg="$1" - echo >&2 "[WARNING] $msg" -} - -# Function to log error messages -joomla_log_error() { - local msg="$1" - echo >&2 "[ERROR] $msg" -} - -# Function to set a line -joomla_echo_line() { - echo >&2 "========================================================================" -} - -# Function to set a line at end -joomla_echo_line_start() { - joomla_echo_line - echo >&2 -} - -# Function to set a line at end -joomla_echo_line_end() { - echo >&2 - joomla_echo_line -} - -# Function to give final success message (1) -joomla_log_configured_success_message() { - joomla_log "This server is now configured to run Joomla!" -} - -# Function to give final success message (2) -joomla_log_success_and_need_db_message() { - joomla_log_configured_success_message - echo >&2 - joomla_log " NOTE: You will need your database server address, database name," - joomla_log " and database user credentials to install Joomla." -} - -# Function to validate URLs -joomla_validate_url() { - if [[ $1 =~ ^http(s)?://[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(/.*)?$ ]]; then - return 0 - else - return 1 - fi -} - -# Function to validate file path -joomla_validate_path() { - if [[ -f $1 ]]; then - return 0 - else - return 1 - fi -} - -# Function to split values by semicolon -joomla_get_array_by_semicolon() { - local input=$1 # The input string to be split - local -n arr=$2 # The array to store the split values (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=';' read -ra arr <<< "$input" # Split the input by semicolon and store in array - IFS=$old_IFS # Restore the original IFS value -} - -# Function to split values by colon to get host and port -joomla_get_host_port_by_colon() { - local input=$1 # The input string to be split - local -n hostname=$2 # The variable to store the hostname (passed by reference) - local -n port=$3 # The variable to store the port (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=':' read -r hostname port <<< "$input" # Split the input by colon and store in hostname and port - IFS=$old_IFS # Restore the original IFS value -} - -# Function to install extension from URL -joomla_install_extension_via_url() { - local url=$1 - if joomla_validate_url "$url"; then - if php cli/joomla.php extension:install --url "$url" --no-interaction; then - joomla_log_info "Successfully installed $url" - else - joomla_log_error "Failed to install $url" - fi - else - joomla_log_error "Invalid URL: $url" - fi -} - -# Function to install extension from path -joomla_install_extension_via_path() { - local path=$1 - if joomla_validate_path "$path"; then - if php cli/joomla.php extension:install --path "$path" --no-interaction; then - joomla_log_info "Successfully installed $path" - else - joomla_log_error "Failed to install $path" - fi - else - joomla_log_error "Invalid Path: $path" - fi -} - -# Function to validate necessary environment variables -joomla_validate_vars() { - # Basic email regex for validation - local email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_error "JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - return 0 -} - -# Function to check if auto deploy can be done -joomla_can_auto_deploy() { - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - if joomla_validate_vars; then - return 0 - fi - fi - - return 1 -} - -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 - - # start Joomla message block - joomla_echo_line_start - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - joomla_log_warning "both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - joomla_log "Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - joomla_log "instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - joomla_log_error "Missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables." - joomla_log "Did you forget to --link some_mysql_container:mysql or set an external db" - joomla_log "with -e JOOMLA_DB_HOST=hostname:port?" - # end Joomla message block - joomla_echo_line_end - 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 - joomla_log_error "Missing required JOOMLA_DB_PASSWORD environment variable." - joomla_log "Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - joomla_log "(Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - # end Joomla message block - joomla_echo_line_end - 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 - - joomla_log_info "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - joomla_log_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 - - joomla_log "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}" - - # if the (installation) directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && joomla_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 - - joomla_log_configured_success_message - - # Install any extensions found in the extensions urls env - if [[ -n "${JOOMLA_EXTENSIONS_URLS}" && "${#JOOMLA_EXTENSIONS_URLS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_URLS" J_E_URLS - for extension_url in "${J_E_URLS[@]}"; do - joomla_install_extension_via_url "$extension_url" - done - fi - - # Install any extensions found in the extensions paths env - if [[ -n "${JOOMLA_EXTENSIONS_PATHS}" && "${#JOOMLA_EXTENSIONS_PATHS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_PATHS" J_E_PATHS - for extension_path in "${J_E_PATHS[@]}"; do - joomla_install_extension_via_path "$extension_path" - done - fi - - if [[ -n "${JOOMLA_SMTP_HOST}" && "${JOOMLA_SMTP_HOST}" == *:* ]]; then - joomla_get_host_port_by_colon "$JOOMLA_SMTP_HOST" JOOMLA_SMTP_HOST JOOMLA_SMTP_HOST_PORT - fi - - # add the smtp host to configuration file - if [[ -n "${JOOMLA_SMTP_HOST}" && "${#JOOMLA_SMTP_HOST}" -gt 2 ]]; then - chmod +w configuration.php - sed -i "s/public \$mailer = 'mail';/public \$mailer = 'smtp';/g" configuration.php - sed -i "s/public \$smtphost = 'localhost';/public \$smtphost = '${JOOMLA_SMTP_HOST}';/g" configuration.php - fi - - # add the smtp port to configuration file - if [[ -n "${JOOMLA_SMTP_HOST_PORT}" ]]; then - sed -i "s/public \$smtpport = 25;/public \$smtpport = ${JOOMLA_SMTP_HOST_PORT};/g" configuration.php - fi - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set the correct ownership of all files touched during installation - if ! chown -R "$user:$group" .; then - joomla_log_error "Ownership of all files touched during installation failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - joomla_log_error "Permissions of configuration.php failed to be corrected." - fi - fi - else - joomla_log_success_and_need_db_message - fi - else - joomla_log_success_and_need_db_message - fi - # end Joomla message block - joomla_echo_line_end -fi - -exec "$@" diff --git a/5.2.rc/php8.3/fpm-alpine/makedb.php b/5.2.rc/php8.3/fpm-alpine/makedb.php deleted file mode 100644 index a64d9d3..0000000 --- a/5.2.rc/php8.3/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} dbname=postgres"; - $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.2.rc/php8.3/fpm/Dockerfile b/5.2.rc/php8.3/fpm/Dockerfile deleted file mode 100644 index f61606d..0000000 --- a/5.2.rc/php8.3/fpm/Dockerfile +++ /dev/null @@ -1,167 +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.3-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 -# https://github.com/Imagick/imagick/commit/5ae2ecf20a1157073bad0170106ad0cf74e01cb6 (causes a lot of build failures, but strangely only intermittent ones) -# see also https://github.com/Imagick/imagick/pull/641 -# this is "pecl install imagick-3.7.0", but by hand so we can apply a small hack / part of the above commit -# Thanks to @tianon https://github.com/docker-library/wordpress/commit/509adb58cbc7463a03e317931df65868ec8a3e92 - curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \ - echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \ - tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \ - test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \ - sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \ - grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php && exit 1 || :; \ - docker-php-ext-install /tmp/imagick-3.7.0; \ - rm -rf imagick.tgz /tmp/imagick-3.7.0; \ -# TODO when imagick has another release, we should ditch this whole block and just update instead - \ -# 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.2.0-rc1 -ENV JOOMLA_SHA512 51dd71e8f58eeba4b86bbedcd8235780bdf5db73852261154d1a0f1b057bda4395be03a60b1173f8b82d791739c0ef224e5c203c8989c54d0c2e31b45fd41b00 - -# 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.2.0-rc1/Joomla_5.2.0-rc1-Release_Candidate-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.2.rc/php8.3/fpm/docker-entrypoint.sh b/5.2.rc/php8.3/fpm/docker-entrypoint.sh deleted file mode 100755 index 6255d23..0000000 --- a/5.2.rc/php8.3/fpm/docker-entrypoint.sh +++ /dev/null @@ -1,385 +0,0 @@ -#!/bin/bash -set -e - -# Load database password from file if specified -if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then - JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") -fi - -# Function to log messages -joomla_log() { - local msg="$1" - echo >&2 " $msg" -} - -# Function to log info messages -joomla_log_info() { - local msg="$1" - echo >&2 "[INFO] $msg" -} - -# Function to log warning messages -joomla_log_warning() { - local msg="$1" - echo >&2 "[WARNING] $msg" -} - -# Function to log error messages -joomla_log_error() { - local msg="$1" - echo >&2 "[ERROR] $msg" -} - -# Function to set a line -joomla_echo_line() { - echo >&2 "========================================================================" -} - -# Function to set a line at end -joomla_echo_line_start() { - joomla_echo_line - echo >&2 -} - -# Function to set a line at end -joomla_echo_line_end() { - echo >&2 - joomla_echo_line -} - -# Function to give final success message (1) -joomla_log_configured_success_message() { - joomla_log "This server is now configured to run Joomla!" -} - -# Function to give final success message (2) -joomla_log_success_and_need_db_message() { - joomla_log_configured_success_message - echo >&2 - joomla_log " NOTE: You will need your database server address, database name," - joomla_log " and database user credentials to install Joomla." -} - -# Function to validate URLs -joomla_validate_url() { - if [[ $1 =~ ^http(s)?://[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(/.*)?$ ]]; then - return 0 - else - return 1 - fi -} - -# Function to validate file path -joomla_validate_path() { - if [[ -f $1 ]]; then - return 0 - else - return 1 - fi -} - -# Function to split values by semicolon -joomla_get_array_by_semicolon() { - local input=$1 # The input string to be split - local -n arr=$2 # The array to store the split values (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=';' read -ra arr <<< "$input" # Split the input by semicolon and store in array - IFS=$old_IFS # Restore the original IFS value -} - -# Function to split values by colon to get host and port -joomla_get_host_port_by_colon() { - local input=$1 # The input string to be split - local -n hostname=$2 # The variable to store the hostname (passed by reference) - local -n port=$3 # The variable to store the port (passed by reference) - local old_IFS=$IFS # Save the original IFS value - # shellcheck disable=SC2034 - # passed by reference - IFS=':' read -r hostname port <<< "$input" # Split the input by colon and store in hostname and port - IFS=$old_IFS # Restore the original IFS value -} - -# Function to install extension from URL -joomla_install_extension_via_url() { - local url=$1 - if joomla_validate_url "$url"; then - if php cli/joomla.php extension:install --url "$url" --no-interaction; then - joomla_log_info "Successfully installed $url" - else - joomla_log_error "Failed to install $url" - fi - else - joomla_log_error "Invalid URL: $url" - fi -} - -# Function to install extension from path -joomla_install_extension_via_path() { - local path=$1 - if joomla_validate_path "$path"; then - if php cli/joomla.php extension:install --path "$path" --no-interaction; then - joomla_log_info "Successfully installed $path" - else - joomla_log_error "Failed to install $path" - fi - else - joomla_log_error "Invalid Path: $path" - fi -} - -# Function to validate necessary environment variables -joomla_validate_vars() { - # Basic email regex for validation - local email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" - - # Check if JOOMLA_SITE_NAME is longer than 2 characters - if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_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 - joomla_log_error "JOOMLA_ADMIN_EMAIL must be a valid email address!" - return 1 - fi - - return 0 -} - -# Function to check if auto deploy can be done -joomla_can_auto_deploy() { - if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && - -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && - -n "${JOOMLA_ADMIN_EMAIL}" ]]; then - - if joomla_validate_vars; then - return 0 - fi - fi - - return 1 -} - -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 - - # start Joomla message block - joomla_echo_line_start - if [ -n "$MYSQL_PORT_3306_TCP" ]; then - if [ -z "$JOOMLA_DB_HOST" ]; then - JOOMLA_DB_HOST='mysql' - else - joomla_log_warning "both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" - joomla_log "Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" - joomla_log "instead of the linked mysql container" - fi - fi - - if [ -z "$JOOMLA_DB_HOST" ]; then - joomla_log_error "Missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables." - joomla_log "Did you forget to --link some_mysql_container:mysql or set an external db" - joomla_log "with -e JOOMLA_DB_HOST=hostname:port?" - # end Joomla message block - joomla_echo_line_end - 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 - joomla_log_error "Missing required JOOMLA_DB_PASSWORD environment variable." - joomla_log "Did you forget to -e JOOMLA_DB_PASSWORD=... ?" - joomla_log "(Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" - # end Joomla message block - joomla_echo_line_end - 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 - - joomla_log_info "Joomla not found in $PWD - copying now..." - if [ "$(ls -A)" ]; then - joomla_log_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 - - joomla_log "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}" - - # if the (installation) directory exists and we can auto deploy - if [ -d installation ] && [ -e installation/joomla.php ] && joomla_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 - - joomla_log_configured_success_message - - # Install any extensions found in the extensions urls env - if [[ -n "${JOOMLA_EXTENSIONS_URLS}" && "${#JOOMLA_EXTENSIONS_URLS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_URLS" J_E_URLS - for extension_url in "${J_E_URLS[@]}"; do - joomla_install_extension_via_url "$extension_url" - done - fi - - # Install any extensions found in the extensions paths env - if [[ -n "${JOOMLA_EXTENSIONS_PATHS}" && "${#JOOMLA_EXTENSIONS_PATHS}" -gt 2 ]]; then - joomla_get_array_by_semicolon "$JOOMLA_EXTENSIONS_PATHS" J_E_PATHS - for extension_path in "${J_E_PATHS[@]}"; do - joomla_install_extension_via_path "$extension_path" - done - fi - - if [[ -n "${JOOMLA_SMTP_HOST}" && "${JOOMLA_SMTP_HOST}" == *:* ]]; then - joomla_get_host_port_by_colon "$JOOMLA_SMTP_HOST" JOOMLA_SMTP_HOST JOOMLA_SMTP_HOST_PORT - fi - - # add the smtp host to configuration file - if [[ -n "${JOOMLA_SMTP_HOST}" && "${#JOOMLA_SMTP_HOST}" -gt 2 ]]; then - chmod +w configuration.php - sed -i "s/public \$mailer = 'mail';/public \$mailer = 'smtp';/g" configuration.php - sed -i "s/public \$smtphost = 'localhost';/public \$smtphost = '${JOOMLA_SMTP_HOST}';/g" configuration.php - fi - - # add the smtp port to configuration file - if [[ -n "${JOOMLA_SMTP_HOST_PORT}" ]]; then - sed -i "s/public \$smtpport = 25;/public \$smtpport = ${JOOMLA_SMTP_HOST_PORT};/g" configuration.php - fi - - # fix the configuration.php ownership - if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' configuration.php)" != "$user:$group" ]; then - # Set the correct ownership of all files touched during installation - if ! chown -R "$user:$group" .; then - joomla_log_error "Ownership of all files touched during installation failed to be corrected." - fi - # Set configuration to correct permissions - if ! chmod 444 configuration.php; then - joomla_log_error "Permissions of configuration.php failed to be corrected." - fi - fi - else - joomla_log_success_and_need_db_message - fi - else - joomla_log_success_and_need_db_message - fi - # end Joomla message block - joomla_echo_line_end -fi - -exec "$@" diff --git a/5.2.rc/php8.3/fpm/makedb.php b/5.2.rc/php8.3/fpm/makedb.php deleted file mode 100644 index a64d9d3..0000000 --- a/5.2.rc/php8.3/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} dbname=postgres"; - $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 c7e9396..d75c6cb 100644 --- a/versions-helper.json +++ b/versions-helper.json @@ -60,41 +60,5 @@ "fpm-alpine", "fpm" ] - }, - "5.2.rc": { - "version": "5.2.0-rc1", - "package": "https://github.com/joomla/joomla-cms/releases/download/5.2.0-rc1/Joomla_5.2.0-rc1-Release_Candidate-Full_Package.tar.zst", - "packageType": "tar.zst", - "php": "8.2", - "aliases": ["5.2.0-rc"], - "phpVersions": { - "8.3": { - "pecl": { - "APCu": "5.1.23", - "memcached": "3.2.0", - "redis": "6.0.2" - } - }, - "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" - ] } } \ No newline at end of file