From 75116685118e230d9ec3ef205609afead405b655 Mon Sep 17 00:00:00 2001
From: xZero707 <aleksandar@puharic.com>
Date: Mon, 13 May 2024 19:29:24 +0200
Subject: [PATCH] Deprecate WordPress versions prior to 6.2

---
 README.md                                |  3 +
 build/docker-bake.hcl                    | 92 +-----------------------
 patches/5.9.0/wp-admin-update-core.patch | 14 ----
 3 files changed, 4 insertions(+), 105 deletions(-)
 delete mode 100644 patches/5.9.0/wp-admin-update-core.patch

diff --git a/README.md b/README.md
index 3c647c2..c453cc7 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,9 @@ Attempt to fix several of WordPress anti-patterns in ready to deploy container
   * It has been deprecated/removed in the base
   * This improves build speed as buidling linux/armhf is slow and was taking the most of the time
   * Simplifies maintenance
+- 2024-05-13 Deprecation of WordPress versions prior to 6.2
+  * 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)
 
diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index be91dfd..09eaeaf 100644
--- a/build/docker-bake.hcl
+++ b/build/docker-bake.hcl
@@ -1,15 +1,5 @@
 group "default" {
   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",
     "6_2_0",
     "6_2_1",
     "6_2_2",
@@ -74,7 +64,7 @@ function "get-cache-to" {
 
 # Get list of image tags and registries
 # Takes a version and a list of extra versions to tag
-# eg. get-tags("5.9.0", ["5", "5.9", "latest"])
+# eg. get-tags("6.2.0", ["6", "6.2", "latest"])
 function "get-tags" {
   params = [version, extra_versions]
   result = concat(
@@ -95,86 +85,6 @@ function "get-tags" {
 # Define the build targets
 ##########################
 
-target "5_9_0" {
-  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
-  cache-from = get-cache-from("5.9.0")
-  cache-to   = get-cache-to("5.9.0")
-  tags       = get-tags("5.9.0", [])
-  args       = get-args("5.9.0", "5.9.0")
-}
-
-target "5_9_1" {
-  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
-  cache-from = get-cache-from("5.9.1")
-  cache-to   = get-cache-to("5.9.1")
-  tags       = get-tags("5.9.1", [])
-  args       = get-args("5.9.1", "5.9.1")
-}
-
-target "5_9_2" {
-  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
-  cache-from = get-cache-from("5.9.2")
-  cache-to   = get-cache-to("5.9.2")
-  tags       = get-tags("5.9.2", [])
-  args       = get-args("5.9.2", "5.9.1")
-}
-
-target "5_9_3" {
-  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
-  cache-from = get-cache-from("5.9.3")
-  cache-to   = get-cache-to("5.9.3")
-  tags       = get-tags("5.9.3", ["5", "5.9"])
-  args       = get-args("5.9.3", "5.9.1")
-}
-
-target "6_0_0" {
-  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
-  cache-from = get-cache-from("6.0.0")
-  cache-to   = get-cache-to("6.0.0")
-  tags       = get-tags("6.0.0", [])
-  args       = get-args("6.0.0", "5.9.1")
-}
-
-target "6_0_1" {
-  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
-  cache-from = get-cache-from("6.0.1")
-  cache-to   = get-cache-to("6.0.1")
-  tags       = get-tags("6.0.1", [])
-  args       = get-args("6.0.1", "5.9.1")
-}
-
-target "6_0_2" {
-  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
-  cache-from = get-cache-from("6.0.2")
-  cache-to   = get-cache-to("6.0.2")
-  tags       = get-tags("6.0.2", [])
-  args       = get-args("6.0.2", "5.9.1")
-}
-
-target "6_0_3" {
-  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
-  cache-from = get-cache-from("6.0.3")
-  cache-to   = get-cache-to("6.0.3")
-  tags       = get-tags("6.0.3", ["6.0"])
-  args       = get-args("6.0.3", "5.9.1")
-}
-
-target "6_1_0" {
-  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
-  cache-from = get-cache-from("6.1.0")
-  cache-to   = get-cache-to("6.1.0")
-  tags       = get-tags("6.1.0", [])
-  args       = get-args("6.1.0", "5.9.1")
-}
-
-target "6_1_1" {
-  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
-  cache-from = get-cache-from("6.1.1")
-  cache-to   = get-cache-to("6.1.1")
-  tags       = get-tags("6.1.1", ["6.1"])
-  args       = get-args("6.1.1", "5.9.1")
-}
-
 target "6_2_0" {
   inherits   = ["build-dockerfile", "build-platforms", "build-common"]
   cache-from = get-cache-from("6.2.0")
diff --git a/patches/5.9.0/wp-admin-update-core.patch b/patches/5.9.0/wp-admin-update-core.patch
deleted file mode 100644
index 54b9e57..0000000
--- a/patches/5.9.0/wp-admin-update-core.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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.