* PHP 8.4 integration

* RabbitMQ version upgrade
* MongoDB version upgrade
* php_redis and php_amqp fix
* Readme update

Author: StaffNowa

.env.dist

@@ -37,8 +37,8 @@ USER_CONFIG_PATH=./user
 # Debian OS available versions: jessie, stretch, buster, bullseye, bookworm
 DEBIAN_VERSION=bookworm
 
-# PHP available versions: 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3
-PHP_VERSION=8.3
+# PHP available versions: 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4
+PHP_VERSION=8.4
 
 # Nginx settings
 NGINX_CACHE=yes
@@ -134,8 +134,8 @@ XDEBUG_FILE_LINK_FORMAT="phpstorm://open?file=%f&line=%l"
 # Xdebug IDE configuration.
 PHP_IDE_CONFIG=serverName=symfony-docker
 
-# Node JS available versions: 16, 18, 20, 20, 21, 22
-NODE_JS_VERSION=22
+# Node JS available versions: 16, 18, 20, 20, 21, 22, 23
+NODE_JS_VERSION=23
 
 CLEAN_NGINX_LOGS=no
 CLEAN_SF_logs=no
@@ -164,11 +164,11 @@ PHP_IMAP=no
 
 EXTERNAL_NETWORK=no
 
-RABBITMQ_VERSION=3.13.6
+RABBITMQ_VERSION=4.0.5
 ELASTICSEARCH_VERSION=6.8.23
 ELK_VERSION=7.16.0
-# MongoDB available versions: 4.2.24, 4.4.29, 5.0.27, 6.0.16
-MONGODB_VERSION=6.0.16
+# MongoDB available versions: 4.2.24, 4.4.29, 5.0.30, 6.0.19
+MONGODB_VERSION=6.0.19
 # wkhtmltopdf available versions: 0.12.3, 0.12.4, 0.12.5, 0.12.6
 WKHTMLTOPDF_VERSION=0.12.3
 

README.md

@@ -139,12 +139,12 @@ sudo curl -L "https://github.com/docker/compose/releases/download/v2.28.1/docker
     ```
 
 # PHP extensions
-| Extension | PHP 7.1 | PHP 7.2 | PHP 7.3 | PHP 7.4 | PHP 8.0 | PHP 8.1 | PHP 8.2 | PHP 8.3 |
-|-----------|---------|---------|---------|---------|---------|---------|---------|---------|
-| amqp      | 1.11.0  | 1.11.0  | 1.11.0  | 2.1.1   | 2.1.1   | 2.1.1   | 2.1.1   | 2.1.1   |
-| mongodb   | 1.11.1  | 1.16.2  | 1.16.2  | 1.17.1  | 1.17.1  | 1.17.1  | 1.17.1  | 1.17.1  |
-| redis     | 5.3.7   | 6.0.2   | 6.0.2   | 6.0.2   | 6.0.2   | 6.0.2   | 6.0.2   | 6.0.2   |
-| xdebug    | 2.9.8   | 3.1.6   | 3.1.6   | 3.1.6   | 3.1.6   | 3.1.6   | 3.1.6   | 3.1.6   |
+| Extension | PHP 7.1 | PHP 7.2 | PHP 7.3 | PHP 7.4 | PHP 8.0 | PHP 8.1 | PHP 8.2 | PHP 8.3 | PHP 8.4 |
+|-----------|---------|---------|---------|---------|---------|---------|---------|---------|---------|
+| amqp      | 1.11.0  | 1.11.0  | 1.11.0  | 2.1.2   | 2.1.2   | 2.1.2   | 2.1.2   | 2.1.2   | 2.1.2   |
+| mongodb   | 1.11.1  | 1.16.2  | 1.16.2  | 1.20.1  | 1.20.1  | 1.20.1  | 1.20.1  | 1.20.1  | 1.20.1  |
+| redis     | 5.3.7   | 5.3.7   | 5.3.7   | 6.1.0   | 6.1.0   | 6.1.0   | 6.1.0   | 6.1.0   | 6.1.0   |
+| xdebug    | 2.9.8   | 3.1.6   | 3.1.6   | 3.1.6   | 3.4.0   | 3.4.0   | 3.4.0   | 3.4.0   | 3.4.0   |
 
 # DirectAdmin support us!
 

commands/start.go

@@ -215,7 +215,7 @@ func doPhpBuild() {
 		phpExtConfigure = append(phpExtConfigure, "docker-php-ext-configure zip --with-libzip")
 	}
 
-	if phpVersion >= "7.4" && phpVersion <= "8.3" {
+	if phpVersion >= "7.4" && phpVersion <= "8.4" {
 		phpExtConfigure = append(phpExtConfigure, "docker-php-ext-configure zip")
 	}
 
@@ -227,7 +227,7 @@ func doPhpBuild() {
 	}
 
 	if os.Getenv("PHP_GD") == "yes" {
-		supportedVersions := []string{"7.4", "8.0", "8.1", "8.2", "8.3"}
+		supportedVersions := []string{"7.4", "8.0", "8.1", "8.2", "8.3", "8.4"}
 		gdConfigure := "&& docker-php-ext-configure gd"
 		if !util.Contains(supportedVersions, phpVersion) {
 			gdConfigure += " --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/"
@@ -245,8 +245,8 @@ func doPhpBuild() {
 			peclInstall = append(peclInstall, "amqp-1.11.0")
 		}
 
-		if phpVersion >= "7.3" && phpVersion <= "8.3" {
-			peclInstall = append(peclInstall, "amqp-2.1.1")
+		if phpVersion >= "7.4" && phpVersion <= "8.4" {
+			peclInstall = append(peclInstall, "amqp-2.1.2")
 		}
 
 		util.Sed("__RABBIT_MQ__", "&& echo 'extension=amqp.so' >> $$PHP_INI_DIR/conf.d/docker-php-ext-amqp.ini"+" \\", "config/php/Dockerfile")
@@ -264,8 +264,8 @@ func doPhpBuild() {
 			peclInstall = append(peclInstall, "mongodb-1.16.2")
 		}
 
-		if phpVersion >= "7.4" && phpVersion <= "8.3" {
-			peclInstall = append(peclInstall, "mongodb-1.17.1")
+		if phpVersion >= "7.4" && phpVersion <= "8.4" {
+			peclInstall = append(peclInstall, "mongodb-1.20.1")
 		}
 
 		if phpVersion != "7.2" {
@@ -284,12 +284,12 @@ func doPhpBuild() {
 	}
 
 	if os.Getenv("REDIS") == "yes" {
-		if phpVersion == "7.1" {
+		if phpVersion >= "7.1" && phpVersion <= "7.3" {
 			peclInstall = append(peclInstall, "redis-5.3.7")
 		}
 
-		if phpVersion >= "7.2" && phpVersion <= "8.3" {
-			peclInstall = append(peclInstall, "redis-6.0.2")
+		if phpVersion >= "7.4" && phpVersion <= "8.4" {
+			peclInstall = append(peclInstall, "redis-6.1.0")
 		}
 
 		phpExtEnable = append(phpExtEnable, "redis")
@@ -308,8 +308,8 @@ func doPhpBuild() {
 			peclInstall = append(peclInstall, "xdebug-3.1.6")
 		}
 
-		if phpVersion >= "8.0" && phpVersion <= "8.3" {
-			peclInstall = append(peclInstall, "xdebug-3.3.1")
+		if phpVersion >= "8.0" && phpVersion <= "8.4" {
+			peclInstall = append(peclInstall, "xdebug-3.4.0")
 		}
 
 		util.Copy("config/php/conf.d/xdebug.d4d", "config/php/conf.d/xdebug.ini")
@@ -324,7 +324,7 @@ func doPhpBuild() {
 			util.AppendFile("config/php/conf.d/xdebug.ini", fmt.Sprintf("\nxdebug.remote_connect_back = %s", os.Getenv("XDEBUG_REMOTE_CONNECT_BACK")))
 		}
 
-		if phpVersion >= "7.1" && phpVersion <= "8.3" {
+		if phpVersion >= "7.1" && phpVersion <= "8.4" {
 			util.Sed("__XDEBUG__", "&& echo 'zend_extension=xdebug.so' >> $$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini"+" \\", "config/php/Dockerfile")
 		} else {
 			util.Sed("__XDEBUG__", "&& echo 'extension=xdebug.so' >> $$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini"+" \\", "config/php/Dockerfile")