From 11f12f35d20cb4eb19a6d92dcc7379d4ee84ce30 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko.korhonen@druid.fi>
Date: Wed, 20 Nov 2024 09:00:18 +0200
Subject: [PATCH] PHP 8.4.0

---
 README.md           | 26 +++++++++++++++-----------
 php/docker-bake.hcl | 16 ++++++++--------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index a865d9d..6023aae 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,9 @@ ENV variables:
 Tags:
 
 - `druidfi/php:8.1` and `druidfi/php:8.1.x`
-- `druidfi/php:8`, `druidfi/php:8.2`, `druidfi/php:8.2.x` and `druidfi/php:latest`
-- `druidfi/php:8.3` and `druidfi/php:8.3.x`
+- `druidfi/php:8.2` and `druidfi/php:8.2.x`
+- `druidfi/php:8`, `druidfi/php:8.3`, `druidfi/php:8.3.x` and `druidfi/php:latest`
+- `druidfi/php:8.4` and `druidfi/php:8.4.x`
 
 Added features:
 
@@ -43,9 +44,10 @@ Added features:
 
 Tags:
 
-- `druidfi/php-fpm:8.1`, `druidfi/php-fpm:8.1.x`
-- `druidfi/php-fpm:8`, `druidfi/php-fpm:8.2`, `druidfi/php-fpm:8.2.x` and `druidfi/php-fpm:latest`
-- `druidfi/php-fpm:8.3`, `druidfi/php-fpm:8.3.x`
+- `druidfi/php-fpm:8.1` and `druidfi/php-fpm:8.1.x`
+- `druidfi/php-fpm:8.2` and `druidfi/php-fpm:8.2.x`
+- `druidfi/php-fpm:8`, `druidfi/php-fpm:8.3`, `druidfi/php-fpm:8.3.x` and `druidfi/php-fpm:latest`
+- `druidfi/php-fpm:8.4` and `druidfi/php-fpm:8.4.x`
 
 Added features:
 
@@ -56,9 +58,10 @@ Added features:
 
 Tags:
 
-- `druidfi/drupal:8.1`, `druidfi/drupal:8.1.x`
-- `druidfi/drupal:8`, `druidfi/drupal:8.2`, `druidfi/drupal:8.2.x` and `druidfi/drupal:latest`
-- `druidfi/drupal:8.3`, `druidfi/drupal:8.3.x`
+- `druidfi/drupal:php-8.1` and `druidfi/drupal:php-8.1.x`
+- `druidfi/drupal:php-8.2` and `druidfi/drupal:php-8.2.x`
+- `druidfi/drupal:php-8`, `druidfi/drupal:php-8.3`, `druidfi/drupal:php-8.3.x` and `druidfi/drupal:latest`
+- `druidfi/drupal:php-8.4` and `druidfi/drupal:php-8.4.x`
 
 Added features:
 
@@ -79,9 +82,10 @@ ENV variables:
 
 ### druidfi/drupal-web variant
 
-- `druidfi/drupal-web:php-8.1`, `druidfi/drupal-web:php-8.1.x`
-- `druidfi/drupal-web:php-8`, `druidfi/drupal-web:php-8.2`, `druidfi/drupal-web:php-8.2.x` and `druidfi/drupal-web:latest`
-- `druidfi/drupal-web:php-8.3`, `druidfi/drupal-web:php-8.3.x`
+- `druidfi/drupal-web:php-8.1`, `druidfi/drupal-web:php-8.1.x` and `druidfi/drupal-web:v8.1.x`
+- `druidfi/drupal-web:php-8.2`, `druidfi/drupal-web:php-8.2.x` and `druidfi/drupal-web:v8.2.x`
+- `druidfi/drupal-web:php-8`, `druidfi/drupal-web:php-8.3`, `druidfi/drupal-web:php-8.3.x`, `druidfi/drupal-web:v8.3.x` and `druidfi/drupal-web:latest`
+- `druidfi/drupal-web:php-8.4`, `druidfi/drupal-web:php-8.4.x` and `druidfi/drupal-web:v8.4.x`
 
 Added features:
 
diff --git a/php/docker-bake.hcl b/php/docker-bake.hcl
index 075aa92..41c2d14 100644
--- a/php/docker-bake.hcl
+++ b/php/docker-bake.hcl
@@ -84,7 +84,7 @@ target "php-82" {
     PHP_VERSION = "8.2"
     PHP_SHORT_VERSION = "82"
   }
-  tags = ["${REPO_BASE}:8", "${REPO_BASE}:8.2", "${REPO_BASE}:${PHP82_MINOR}", "${REPO_BASE}:latest"]
+  tags = ["${REPO_BASE}:8.2", "${REPO_BASE}:${PHP82_MINOR}"]
 }
 
 target "php-83" {
@@ -94,7 +94,7 @@ target "php-83" {
     PHP_VERSION = "8.3"
     PHP_SHORT_VERSION = "83"
   }
-  tags = ["${REPO_BASE}:8.3", "${REPO_BASE}:${PHP83_MINOR}"]
+  tags = ["${REPO_BASE}:8", "${REPO_BASE}:8.3", "${REPO_BASE}:${PHP83_MINOR}", "${REPO_BASE}:latest"]
 }
 
 target "php-84" {
@@ -123,12 +123,12 @@ target "php-fpm-81" {
 
 target "php-fpm-82" {
   inherits = ["common", "php-82", "php-fpm"]
-  tags = ["${REPO_FPM}:8", "${REPO_FPM}:8.2", "${REPO_FPM}:${PHP82_MINOR}", "${REPO_FPM}:latest"]
+  tags = ["${REPO_FPM}:8.2", "${REPO_FPM}:${PHP82_MINOR}"]
 }
 
 target "php-fpm-83" {
   inherits = ["common", "php-83", "php-fpm"]
-  tags = ["${REPO_FPM}:8.3", "${REPO_FPM}:${PHP83_MINOR}"]
+  tags = ["${REPO_FPM}:8", "${REPO_FPM}:8.3", "${REPO_FPM}:${PHP83_MINOR}", "${REPO_FPM}:latest"]
 }
 
 target "php-fpm-84" {
@@ -149,13 +149,13 @@ target "drupal-fpm-81" {
 target "drupal-fpm-82" {
   inherits = ["common", "php-82", "php-fpm"]
   target = "drupal-php-82"
-  tags = ["${REPO_DRUPAL_FPM}:php-8", "${REPO_DRUPAL_FPM}:php-8.2", "${REPO_DRUPAL_FPM}:php-${PHP82_MINOR}", "${REPO_DRUPAL_FPM}:latest"]
+  tags = ["${REPO_DRUPAL_FPM}:php-8.2", "${REPO_DRUPAL_FPM}:php-${PHP82_MINOR}"]
 }
 
 target "drupal-fpm-83" {
   inherits = ["common", "php-83", "php-fpm"]
   target = "drupal-php-83"
-  tags = ["${REPO_DRUPAL_FPM}:php-8.3", "${REPO_DRUPAL_FPM}:php-${PHP83_MINOR}"]
+  tags = ["${REPO_DRUPAL_FPM}:php-8", "${REPO_DRUPAL_FPM}:php-8.3", "${REPO_DRUPAL_FPM}:php-${PHP83_MINOR}", "${REPO_DRUPAL_FPM}:latest"]
 }
 
 target "drupal-fpm-84" {
@@ -177,13 +177,13 @@ target "drupal-web-81" {
 target "drupal-web-82" {
   inherits = ["common", "php-82", "php-fpm"]
   target = "drupal-web"
-  tags = ["${REPO_DRUPAL_WEB}:php-8", "${REPO_DRUPAL_WEB}:php-8.2", "${REPO_DRUPAL_WEB}:php-${PHP82_MINOR}", "${REPO_DRUPAL_WEB}:v${PHP82_MINOR}", "${REPO_DRUPAL_WEB}:latest"]
+  tags = ["${REPO_DRUPAL_WEB}:php-8.2", "${REPO_DRUPAL_WEB}:php-${PHP82_MINOR}", "${REPO_DRUPAL_WEB}:v${PHP82_MINOR}"]
 }
 
 target "drupal-web-83" {
   inherits = ["common", "php-83", "php-fpm"]
   target = "drupal-web"
-  tags = ["${REPO_DRUPAL_WEB}:php-8.3", "${REPO_DRUPAL_WEB}:php-${PHP83_MINOR}", "${REPO_DRUPAL_WEB}:v${PHP83_MINOR}"]
+  tags = ["${REPO_DRUPAL_WEB}:php-8", "${REPO_DRUPAL_WEB}:php-8.3", "${REPO_DRUPAL_WEB}:php-${PHP83_MINOR}", "${REPO_DRUPAL_WEB}:v${PHP83_MINOR}", "${REPO_DRUPAL_WEB}:latest"]
 }
 
 target "drupal-web-84" {