docker-compose.yml rename into new compose.yaml standard

Author: StaffNowa

.env.dist

@@ -140,7 +140,7 @@ NODE_JS_VERSION=22
 CLEAN_NGINX_LOGS=no
 CLEAN_SF_logs=no
 
-# docker-compose.yml configuration
+# compose.yaml configuration
 NODEJS=no
 YARN=no
 WKHTMLTOPDF=no

.gitignore

@@ -2,7 +2,7 @@
 .env
 .env.secret
 .env.git
-docker-compose.yml
+compose.yaml
 /project
 /var
 /.composer/cache

README.md

@@ -115,7 +115,7 @@ sudo curl -L "https://github.com/docker/compose/releases/download/v2.28.1/docker
 
     ## How it works?
 
-    Have a look at the `docker-compose.yml` file, here are the `docker-compose` built images:
+    Have a look at the `compose.yaml` file, here are the `docker-compose` built images:
 
     * `nginx`: Nginx is one of the most popular web servers in the world and responsible for hosting some of the largest and highest-traffic sites on the internet. It is more resource-friendly than Apache in most cases and can be used as a web server or reverse proxy.
     * `php`: PHP is a popular general-purpose scripting language that is especially suited to web development.

commands/start.go

@@ -466,68 +466,68 @@ func doBuildMySQLConf() {
 }
 
 func doBuild() {
-	util.Copy("docker/compose.yml", "docker-compose.yml")
-	util.AppendFile("docker-compose.yml", util.FileGetContents("docker/php.yml"))
+	util.Copy("docker/compose.yml", "compose.yaml")
+	util.AppendFile("compose.yaml", util.FileGetContents("docker/php.yml"))
 
 	if os.Getenv("DOCKER_ENV_PHP") == "yes" {
-		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/env/php.yml"))
+		util.AppendFile("compose.yaml", util.FileGetContents("docker/env/php.yml"))
 	}
 
 	if os.Getenv("MYSQL") == "yes" {
 		if os.Getenv("MYSQL_INST") == "mysql" {
-			util.AppendFile("docker-compose.yml", util.FileGetContents("docker/mysql.yml"))
+			util.AppendFile("compose.yaml", util.FileGetContents("docker/mysql.yml"))
 		} else {
 			if os.Getenv("MYSQL_INST") == "mariadb" {
-				util.AppendFile("docker-compose.yml", util.FileGetContents("docker/mariadb.yml"))
+				util.AppendFile("compose.yaml", util.FileGetContents("docker/mariadb.yml"))
 			}
 		}
-		util.Sed("#php_depends_on", "depends_on:\r\n      - mysql", "docker-compose.yml")
+		util.Sed("#php_depends_on", "depends_on:\r\n      - mysql", "compose.yaml")
 	} else {
-		util.Sed("#php_depends_on", "", "docker-compose.yml")
+		util.Sed("#php_depends_on", "", "compose.yaml")
 	}
 
 	if os.Getenv("MAILHOG") == "yes" {
-		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/mailhog.yml"))
+		util.AppendFile("compose.yaml", util.FileGetContents("docker/mailhog.yml"))
 	}
 
 	if os.Getenv("MAILPIT") == "yes" {
-		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/mailpit.yml"))
+		util.AppendFile("compose.yaml", util.FileGetContents("docker/mailpit.yml"))
 	}
 
 	if os.Getenv("PMA") == "yes" && os.Getenv("MYSQL") == "yes" {
-		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/phpmyadmin.yml"))
+		util.AppendFile("compose.yaml", util.FileGetContents("docker/phpmyadmin.yml"))
 	}
 
 	if os.Getenv("REDIS") == "yes" {
-		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/redis.yml"))
+		util.AppendFile("compose.yaml", util.FileGetContents("docker/redis.yml"))
 	}
 
 	if os.Getenv("RABBITMQ") == "yes" {
-		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/rabbitmq.yml"))
+		util.AppendFile("compose.yaml", util.FileGetContents("docker/rabbitmq.yml"))
 	}
 
 	if os.Getenv("ELASTICSEARCH") == "yes" {
-		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/elasticsearch.yml"))
+		util.AppendFile("compose.yaml", util.FileGetContents("docker/elasticsearch.yml"))
 	}
 
 	if os.Getenv("NGROK") == "yes" {
-		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/ngrok.yml"))
+		util.AppendFile("compose.yaml", util.FileGetContents("docker/ngrok.yml"))
 	}
 
 	if os.Getenv("MONGODB") == "yes" {
-		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/mongodb.yml"))
+		util.AppendFile("compose.yaml", util.FileGetContents("docker/mongodb.yml"))
 	}
 
 	if os.Getenv("ELK") == "yes" {
-		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/elk.yml"))
+		util.AppendFile("compose.yaml", util.FileGetContents("docker/elk.yml"))
 	}
 
 	if os.Getenv("EXTERNAL_NETWORK") == "no" || os.Getenv("EXTERNAL_NETWORK") == "yes" {
-		util.Sed("__NGINX_NETWORKS__", fmt.Sprintf("networks:\n      default:\n        aliases:\n          - %s", os.Getenv("PROJECT_DOMAIN_1")), "docker-compose.yml")
+		util.Sed("__NGINX_NETWORKS__", fmt.Sprintf("networks:\n      default:\n        aliases:\n          - %s", os.Getenv("PROJECT_DOMAIN_1")), "compose.yaml")
 	}
 
 	if os.Getenv("EXTERNAL_NETWORK") == "yes" {
-		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/network.yml"))
+		util.AppendFile("compose.yaml", util.FileGetContents("docker/network.yml"))
 	}
 }
 

docker/compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   nginx:
     build: