From 847352b62d460474365df74b5fbb3d422f83e462 Mon Sep 17 00:00:00 2001
From: xZero707 <aleksandar@puharic.com>
Date: Thu, 3 Feb 2022 19:50:56 +0100
Subject: [PATCH] Update WordPress 5.8.3 -> 5.9.0

---
 Dockerfile                               |  2 +-
 build/docker-bake.hcl                    | 12 ++++++++++--
 patches/5.9.0/wp-admin-update-core.patch | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 patches/5.9.0/wp-admin-update-core.patch

diff --git a/Dockerfile b/Dockerfile
index 81c5cd0..001c001 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION=7.4
-ARG WP_VERSION=5.8.0
+ARG WP_VERSION=5.9.0
 
 # WP CLI
 FROM --platform=${TARGETPLATFORM} wordpress:cli-php${PHP_VERSION} AS wp-cli
diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index 73db573..51644fb 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"]
+  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"]
 }
 
 target "build-dockerfile" {
@@ -152,8 +152,16 @@ target "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", "docker.io/nlss/wordpress:latest"]
+  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", "docker.io/nlss/wordpress:5.9", "docker.io/nlss/wordpress:latest"]
+  args = {
+    WP_VERSION = "5.9.0"
+  }
+}
diff --git a/patches/5.9.0/wp-admin-update-core.patch b/patches/5.9.0/wp-admin-update-core.patch
new file mode 100644
index 0000000..54b9e57
--- /dev/null
+++ b/patches/5.9.0/wp-admin-update-core.patch
@@ -0,0 +1,14 @@
+--- update-core.php	2022-02-03 19:41:16.566727872 +0100
++++ update-core.php	2022-02-03 19:44:43.875250278 +0100
+@@ -1088,6 +1088,11 @@
+ 		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+ 	}
+ 
++	wp_die(
++		__( 'Sorry, you are not allowed to update this site.' ) .
++		' Click <a href="https://github.com/N0rthernL1ghts/wordpress/wiki/WordPress-Core-Updates">here</a> to learn why.'
++	);
++
+ 	check_admin_referer( 'upgrade-core' );
+ 
+ 	// Do the (un)dismiss actions before headers, so that they can redirect.