diff --git a/README.md b/README.md index 07b24c6..cca82b7 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,15 @@ WorPress docker image, powered by nginx/php-fpm combo and managed by s6 supervis Attempt to fix several of WordPress anti-patterns in ready to deploy container +#### Deprecation notice +- 2023-01-20 Deprecation of WordPress versions prior to 5.9 + * Preparation for PHP8.1 upgrade. + * WordPress versions prior to 5.9 have no PHP8.1 support. + * PHP8.0 active support has ended since 2022-11-28, therefore skipping this release + * PHP7.4 reached end-of-life on 2022-11-28 and should not be used. + * Old images will remain, but will receive no further updates, until their eventual removal. Usage is not recommended. + * This decision will make build stack significantly lighter, ensuring much faster future builds + #### Public builds (docker) You can use public build: diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl index 2fbfc0c..5ec1075 100644 --- a/build/docker-bake.hcl +++ b/build/docker-bake.hcl @@ -1,5 +1,5 @@ group "default" { - targets = ["5_3_0", "5_3_1", "5_3_2", "5_4_0", "5_4_1", "5_4_2", "5_5_1", "5_5_3", "5_6_0", "5_6_1", "5_6_2", "5_7_0", "5_7_1", "5_7_2", "5_8_0", "5_8_1", "5_8_2", "5_8_3", "5_9_0", "5_9_1", "5_9_2", "5_9_3", "6_0_0", "6_0_1", "6_0_2", "6_0_3", "6_1_0", "6_1_1"] + targets = ["5_9_0", "5_9_1", "5_9_2", "5_9_3", "6_0_0", "6_0_1", "6_0_2", "6_0_3", "6_1_0", "6_1_1"] } target "build-dockerfile" { @@ -14,150 +14,6 @@ target "build-common" { pull = true } -target "5_3_0" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.3.0"] - args = { - WP_VERSION = "5.3.0" - } -} - -target "5_3_1" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.3.1"] - args = { - WP_VERSION = "5.3.1" - } -} - -target "5_3_2" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.3.2", "docker.io/nlss/wordpress:5.3"] - args = { - WP_VERSION = "5.3.2" - } -} - -target "5_4_0" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.4.0"] - args = { - WP_VERSION = "5.4.0" - } -} - -target "5_4_1" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.4.1"] - args = { - WP_VERSION = "5.4.1" - } -} - -target "5_4_2" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.4.2", "docker.io/nlss/wordpress:5.4"] - args = { - WP_VERSION = "5.4.2" - } -} - -target "5_5_1" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.5.1"] - args = { - WP_VERSION = "5.5.1" - } -} - -target "5_5_3" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.5.3", "docker.io/nlss/wordpress:5.5"] - args = { - WP_VERSION = "5.5.3" - } -} - -target "5_6_0" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.6.0"] - args = { - WP_VERSION = "5.6.0" - } -} - -target "5_6_1" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.6.1"] - args = { - WP_VERSION = "5.6.1" - } -} - -target "5_6_2" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.6.2", "docker.io/nlss/wordpress:5.6"] - args = { - WP_VERSION = "5.6.2" - } -} - -target "5_7_0" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.7.0"] - args = { - WP_VERSION = "5.7.0" - } -} - -target "5_7_1" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.7.1"] - args = { - WP_VERSION = "5.7.1" - } -} - -target "5_7_2" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.7.2", "docker.io/nlss/wordpress:5.7"] - args = { - WP_VERSION = "5.7.2" - } -} - -target "5_8_0" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.8.0"] - args = { - WP_VERSION = "5.8.0" - } -} - -target "5_8_1" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.8.1"] - args = { - WP_VERSION = "5.8.1" - } -} - -target "5_8_2" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.8.2"] - args = { - WP_VERSION = "5.8.2" - } -} - -target "5_8_3" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.8.3", "docker.io/nlss/wordpress:5.8"] - args = { - WP_VERSION = "5.8.3" - } -} - target "5_9_0" { inherits = ["build-dockerfile", "build-platforms", "build-common"] tags = ["docker.io/nlss/wordpress:5.9.0"] diff --git a/patches/5.3.0/wp-admin-update-core.patch b/patches/5.3.0/wp-admin-update-core.patch deleted file mode 100644 index 906b6f6..0000000 --- a/patches/5.3.0/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-09-23 17:11:30.239616145 +0200 -+++ update-core.php 2021-09-23 17:11:47.723078888 +0200 -@@ -797,6 +797,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.3.1/wp-admin-update-core.patch b/patches/5.3.1/wp-admin-update-core.patch deleted file mode 100644 index 3e400e7..0000000 --- a/patches/5.3.1/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-09-23 17:09:32.192073263 +0200 -+++ update-core.php 2021-09-23 17:10:26.225808222 +0200 -@@ -797,6 +797,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.3.2/wp-admin-update-core.patch b/patches/5.3.2/wp-admin-update-core.patch deleted file mode 100644 index 3b6ad82..0000000 --- a/patches/5.3.2/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-09-23 16:58:19.816936501 +0200 -+++ update-core.php 2021-09-23 16:59:47.230959411 +0200 -@@ -797,6 +797,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.4.0/wp-admin-update-core.patch b/patches/5.4.0/wp-admin-update-core.patch deleted file mode 100644 index 7229689..0000000 --- a/patches/5.4.0/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-09-23 17:06:40.030785998 +0200 -+++ update-core.php 2021-09-23 17:07:06.824320534 +0200 -@@ -801,6 +801,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.4.1/wp-admin-update-core.patch b/patches/5.4.1/wp-admin-update-core.patch deleted file mode 100644 index b89d66f..0000000 --- a/patches/5.4.1/wp-admin-update-core.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- update-core.php 2021-09-23 16:50:35.486851925 +0200 -+++ update-core.php 2021-09-23 16:52:57.917876553 +0200 -@@ -801,6 +801,12 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.4.2/wp-admin-update-core.patch b/patches/5.4.2/wp-admin-update-core.patch deleted file mode 100644 index 3cf0767..0000000 --- a/patches/5.4.2/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2020-10-04 19:03:07.898527934 +0200 -+++ update-core-mod.php 2020-10-04 19:04:59.434908923 +0200 -@@ -915,6 +915,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-translations' ); - - require_once ABSPATH . 'wp-admin/admin-header.php'; diff --git a/patches/5.5.1/wp-admin-update-core.patch b/patches/5.5.1/wp-admin-update-core.patch deleted file mode 100644 index 6b4b9e4..0000000 --- a/patches/5.5.1/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2020-10-04 19:51:51.874573636 +0200 -+++ update-core-mod.php 2020-10-04 19:53:36.705858923 +0200 -@@ -917,6 +917,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.5.3/wp-admin-update-core.patch b/patches/5.5.3/wp-admin-update-core.patch deleted file mode 100644 index d22f790..0000000 --- a/patches/5.5.3/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2020-10-04 19:51:51.874573636 +0200 -+++ update-core.php 2020-10-04 19:53:36.705858923 +0200 -@@ -917,6 +917,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.6.0/wp-admin-update-core.patch b/patches/5.6.0/wp-admin-update-core.patch deleted file mode 100644 index 2f384cc..0000000 --- a/patches/5.6.0/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-01-11 20:24:28.531750881 +0100 -+++ update-core.php 2021-01-11 20:27:11.200903166 +0100 -@@ -1049,6 +1049,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.6.1/wp-admin-update-core.patch b/patches/5.6.1/wp-admin-update-core.patch deleted file mode 100644 index 2f384cc..0000000 --- a/patches/5.6.1/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-01-11 20:24:28.531750881 +0100 -+++ update-core.php 2021-01-11 20:27:11.200903166 +0100 -@@ -1049,6 +1049,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.6.2/wp-admin-update-core.patch b/patches/5.6.2/wp-admin-update-core.patch deleted file mode 100644 index 0b3176f..0000000 --- a/patches/5.6.2/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-09-23 17:45:05.840053045 +0200 -+++ update-core.php 2021-09-23 17:45:49.880346653 +0200 -@@ -1049,6 +1049,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.7.0/wp-admin-update-core.patch b/patches/5.7.0/wp-admin-update-core.patch deleted file mode 100644 index 1ceb5dd..0000000 --- a/patches/5.7.0/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-03-19 19:23:29.391214787 +0100 -+++ update-core.php 2021-03-19 19:26:23.798962792 +0100 -@@ -1050,6 +1050,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.7.1/wp-admin-update-core.patch b/patches/5.7.1/wp-admin-update-core.patch deleted file mode 100644 index 1ceb5dd..0000000 --- a/patches/5.7.1/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-03-19 19:23:29.391214787 +0100 -+++ update-core.php 2021-03-19 19:26:23.798962792 +0100 -@@ -1050,6 +1050,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.7.2/wp-admin-update-core.patch b/patches/5.7.2/wp-admin-update-core.patch deleted file mode 100644 index f8e5fe0..0000000 --- a/patches/5.7.2/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-05-28 21:04:43.647362531 +0200 -+++ update-core.php 2021-05-28 21:05:44.224559161 +0200 -@@ -1050,6 +1050,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.8.0/wp-admin-update-core.patch b/patches/5.8.0/wp-admin-update-core.patch deleted file mode 100644 index 2c71767..0000000 --- a/patches/5.8.0/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-09-01 20:18:43.638426162 +0200 -+++ update-core.php 2021-09-01 20:21:05.189582541 +0200 -@@ -1086,6 +1086,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.8.1/wp-admin-update-core.patch b/patches/5.8.1/wp-admin-update-core.patch deleted file mode 100644 index b94fb29..0000000 --- a/patches/5.8.1/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-09-23 17:49:08.351681693 +0200 -+++ update-core.php 2021-09-23 17:49:31.738506750 +0200 -@@ -1086,6 +1086,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.8.2/wp-admin-update-core.patch b/patches/5.8.2/wp-admin-update-core.patch deleted file mode 100644 index 2111ade..0000000 --- a/patches/5.8.2/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2021-11-19 00:50:13.053965611 +0100 -+++ update-core.php 2021-11-19 00:51:23.030501647 +0100 -@@ -1086,6 +1086,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect. diff --git a/patches/5.8.3/wp-admin-update-core.patch b/patches/5.8.3/wp-admin-update-core.patch deleted file mode 100644 index c421db8..0000000 --- a/patches/5.8.3/wp-admin-update-core.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- update-core.php 2022-01-15 06:09:43.165058136 +0100 -+++ update-core.php 2022-01-15 06:11:59.182622152 +0100 -@@ -1086,6 +1086,11 @@ - wp_die( __( 'Sorry, you are not allowed to update this site.' ) ); - } - -+ wp_die( -+ __( 'Sorry, you are not allowed to update this site.' ) . -+ ' Click here to learn why.' -+ ); -+ - check_admin_referer( 'upgrade-core' ); - - // Do the (un)dismiss actions before headers, so that they can redirect.