chore: php 8.1 WP 5.8.3

CHANGELOG.md

@@ -46,4 +46,9 @@ date: 14 November 2020
 
 date: 22 June 2021
 
+## update to WordPress version 5.8.3 PHP 8.1
+
+date: 13 January 2022
+
+---
 ---

pipeline/pipe-resource.yaml

@@ -7,7 +7,7 @@ spec:
   type: image
   params:
     - name: url
-      value: termas.librecloud.online/termas_librecloud/wordpress-fpm:8.0
+      value: termas.librecloud.online/termas_librecloud/wordpress-fpm:8.1
 ---
 apiVersion: tekton.dev/v1alpha1
 kind: PipelineResource

repo-config.yaml

@@ -1,16 +1,15 @@
-
 Active: true
 # Active: false  # to not follow up webhook workflow
 
 # Sources for src file
 Repo: https://github.com/docker-library/wordpress.git
-Source: wordpress/php8.0/fpm-alpine
+Source: wordpress/latest/php8.1/fpm-alpine
 
 TargetGit: ssh://git@rlung.librecloud.online:32225/Termas.LibreCloud.online/wordpress-fpm.git
 
 # Name - Version, etc
 Name: wordpress-fpm
-Version: 8.0
+Version: 8.1
 
 # To get latest
 IMAGE_NAME: wordpress

src/Dockerfile

@@ -1,61 +1,76 @@
-FROM php:8.0-fpm-alpine
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+FROM php:8.1-fpm-alpine
 
-# docker-entrypoint.sh dependencies
 # persistent dependencies
-RUN apk add --no-cache \
+RUN set -eux; \
-    freetype \
+	apk add --no-cache \
-    libpng \
-    libjpeg \
-    libjpeg-turbo \
 # in theory, docker-entrypoint.sh is POSIX-compliant, but priority is a working, consistent image
 		bash \
-# BusyBox sed is not sufficient for some of our sed expressions
-		sed \
 # Ghostscript is required for rendering PDF previews
 		ghostscript \
 # Alpine package for "imagemagick" contains ~120 .so files, see: https://github.com/docker-library/wordpress/pull/497
-		# imagemagick \
+		imagemagick \
 	;
 
 # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions)
-# --enable-gd-native-ttf \
 RUN set -ex; \
-  \
+	\
-  apk add --no-cache --virtual .build-deps \
+	apk add --no-cache --virtual .build-deps \
-  $PHPIZE_DEPS \
+		$PHPIZE_DEPS \
-  freetype-dev \
+		freetype-dev \
-#  imagemagick-dev \
+		imagemagick-dev \
-  libjpeg-turbo-dev \
+		libjpeg-turbo-dev \
-  libpng-dev \
+		libpng-dev \
-  libzip-dev \
+		libwebp-dev \
-  gmp \
+		libzip-dev \
-  gmp-dev \
+		gmp \
-  ; \
+    gmp-dev \
-  docker-php-ext-configure gmp \
+	; \
+	\
+	docker-php-ext-configure gmp \
   ;\
-  docker-php-ext-configure gd --with-freetype --with-jpeg \
+	docker-php-ext-configure gd \
-  ; \
+		--with-freetype \
-  docker-php-ext-install -j "$(nproc)" \
+		--with-jpeg \
-  bcmath \
+		--with-webp \
-  exif \
+	; \
-  gd \ 
+	docker-php-ext-install -j "$(nproc)" \
-  gmp \
+		bcmath \
-  mysqli \
+		exif \
-  zip \
+		gd \
-  ; \
+		mysqli \
-  # pecl install imagick-3.4.4; \
+		zip \
-  # docker-php-ext-install gmp; \
+		gmp \
-  # docker-php-ext-enable imagick; \
+	; \
-  \
+# WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
-  runDeps="$( \
+# https://pecl.php.net/package/imagick
-  scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
+	pecl install imagick-3.6.0; \
-  | tr ',' '\n' \
+	docker-php-ext-enable imagick; \
-  | sort -u \
+	rm -r /tmp/pear; \
-  | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+	\
-  )"; \
+# some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967)
-  apk add --virtual .wordpress-phpexts-rundeps $runDeps; \
+	out="$(php -r 'exit(0);')"; \
-  apk del .build-deps
+	[ -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" ]; \
+	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 .wordpress-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
@@ -84,8 +99,8 @@ RUN { \
 	} > /usr/local/etc/php/conf.d/error-logging.ini
 
 RUN set -eux; \
-	version='5.7.2'; \
+	version='5.8.3'; \
-	sha1='c97c037d942e974eb8524213a505268033aff6c8'; \
+	sha1='3be7ed4dc6f46fe98271b974c88153640e95ad49'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \

src/wp-config-docker.php

@@ -8,7 +8,7 @@
  *
  * This file contains the following configurations:
  *
- * * MySQL settings
+ * * Database settings
  * * Secret keys
  * * Database table prefix
  * * ABSPATH
@@ -39,14 +39,14 @@ if (!function_exists('getenv_docker')) {
 	}
 }
 
-// ** MySQL settings - You can get this info from your web host ** //
+// ** Database settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
 define( 'DB_NAME', getenv_docker('WORDPRESS_DB_NAME', 'wordpress') );
 
-/** MySQL database username */
+/** Database username */
 define( 'DB_USER', getenv_docker('WORDPRESS_DB_USER', 'example username') );
 
-/** MySQL database password */
+/** Database password */
 define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password') );
 
 /**
@@ -55,7 +55,7 @@ define( 'DB_PASSWORD', getenv_docker('WORDPRESS_DB_PASSWORD', 'example password'
  * (However, using "example username" and "example password" in your database is strongly discouraged.  Please use strong, random credentials!)
  */
 
-/** MySQL hostname */
+/** Database hostname */
 define( 'DB_HOST', getenv_docker('WORDPRESS_DB_HOST', 'mysql') );
 
 /** Database charset to use in creating database tables. */
@@ -112,8 +112,8 @@ define( 'WP_DEBUG', !!getenv_docker('WORDPRESS_DEBUG', '') );
 /* Add any custom values between this line and the "stop editing" line. */
 
 // If we're behind a proxy server and using HTTPS, we need to alert WordPress of that fact
-// see also http://codex.wordpress.org/Administration_Over_SSL#Using_a_Reverse_Proxy
+// see also https://wordpress.org/support/article/administration-over-ssl/#using-a-reverse-proxy
-if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
+if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strpos($_SERVER['HTTP_X_FORWARDED_PROTO'], 'https') !== false) {
 	$_SERVER['HTTPS'] = 'on';
 }
 // (we include this by default because reverse proxying is extremely common in container environments)