From 06f3a97f37609b348cca9604da5b61bc5e65b7ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20P=C3=A9rez?= Date: Fri, 9 Aug 2024 01:18:18 +0100 Subject: [PATCH] chore: update to php 8.3 --- CHANGELOG.md | 7 ++++--- src/Dockerfile | 30 +++++++++++++++++++----------- src/wp-config-docker.php | 8 ++++---- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48e07c6..cd33875 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,11 +50,12 @@ date: 22 June 2021 date: 13 January 2022 -## update to WordPress version no-alpine PHP 8.1 +## update to WordPress version no-alpine PHP 8.2 date: 26 October 2022 +## update to WordPress version no-alpine PHP 8.3 + +date: 08 August 2024 --- ---- ---- diff --git a/src/Dockerfile b/src/Dockerfile index b08fb83..d27a790 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -4,12 +4,11 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM php:8.1-fpm +FROM php:8.3-fpm # persistent dependencies RUN set -eux; \ - apt-get update; \ - apt-get install ssmtp -y ;\ + apt-get update; \ apt-get install -y --no-install-recommends \ # Ghostscript is required for rendering PDF previews ghostscript \ @@ -47,9 +46,18 @@ RUN set -ex; \ zip \ ; \ # https://pecl.php.net/package/imagick - pecl install imagick-3.6.0; \ - docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ +# 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 + 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; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ @@ -63,9 +71,9 @@ RUN set -ex; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ ldd "$extDir"/*.so \ - | awk '/=>/ { print $3 }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ - | xargs -r dpkg-query -S \ + | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -rt apt-mark manual; \ @@ -105,8 +113,8 @@ RUN { \ } > /usr/local/etc/php/conf.d/error-logging.ini RUN set -eux; \ - version='6.0.3'; \ - sha1='9ab0d521aac7042cf09946f17ec86dc65b182201'; \ + version='6.6.1'; \ + sha1='cd5544c85824e3cd8105018c63ccdba31883d881'; \ \ curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \ echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \ @@ -140,7 +148,7 @@ RUN set -eux; \ mkdir "wp-content/$dir"; \ done; \ chown -R www-data:www-data wp-content; \ - chmod -R 777 wp-content; \ + chmod -R 1777 wp-content; \ curl -o wp-cli.phar -fSL "https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar"; \ chmod +x wp-cli.phar; \ mv wp-cli.phar /usr/local/bin/wp diff --git a/src/wp-config-docker.php b/src/wp-config-docker.php index f62fc1f..7da50ee 100644 --- a/src/wp-config-docker.php +++ b/src/wp-config-docker.php @@ -3,7 +3,7 @@ * The base configuration for WordPress * * The wp-config.php creation script uses this file during the installation. - * You don't have to use the web site, you can copy this file to "wp-config.php" + * You don't have to use the website, you can copy this file to "wp-config.php" * and fill in the values. * * This file contains the following configurations: @@ -15,7 +15,7 @@ * * This has been slightly modified (to read environment variables) for use in Docker. * - * @link https://wordpress.org/support/article/editing-wp-config-php/ + * @link https://developer.wordpress.org/advanced-administration/wordpress/wp-config/ * * @package WordPress */ @@ -51,7 +51,7 @@ define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password' /** * Docker image fallback values above are sourced from the official WordPress installation wizard: - * https://github.com/WordPress/WordPress/blob/f9cc35ebad82753e9c86de322ea5c76a9001c7e2/wp-admin/setup-config.php#L216-L230 + * https://github.com/WordPress/WordPress/blob/1356f6537220ffdc32b9dad2a6cdbe2d010b7a88/wp-admin/setup-config.php#L224-L238 * (However, using "example username" and "example password" in your database is strongly discouraged. Please use strong, random credentials!) */ @@ -105,7 +105,7 @@ $table_prefix = getenv_docker('WORDPRESS_TABLE_PREFIX', 'wp_'); * For information on other constants that can be used for debugging, * visit the documentation. * - * @link https://wordpress.org/support/article/debugging-in-wordpress/ + * @link https://developer.wordpress.org/advanced-administration/debug/debug-wordpress/ */ define( 'WP_DEBUG', !!getenv_docker('WORDPRESS_DEBUG', '') );