From bba11af4a03889c03789d16354e7f04be0d5a9a1 Mon Sep 17 00:00:00 2001
From: Chingis Sandanov <chingis@chingis.io>
Date: Mon, 5 Aug 2024 17:05:58 +0300
Subject: [PATCH] Migrate docker-compose to new format

---
 README.md                                           |  2 +-
 tests/basic/{docker-compose.yml => compose.yml}     |  2 --
 tests/basic/run.sh                                  | 10 +++++-----
 tests/drupal/10/{docker-compose.yml => compose.yml} |  2 --
 tests/drupal/10/run.sh                              |  6 +++---
 tests/drupal/7/{docker-compose.yml => compose.yml}  |  2 --
 tests/drupal/7/run.sh                               |  6 +++---
 tests/drupal/9/{docker-compose.yml => compose.yml}  |  2 --
 tests/drupal/9/run.sh                               |  6 +++---
 tests/matomo/{docker-compose.yml => compose.yml}    |  2 --
 tests/matomo/run.sh                                 | 10 +++++-----
 tests/php/{docker-compose.yml => compose.yml}       |  2 --
 tests/php/run.sh                                    | 10 +++++-----
 tests/wordpress/{docker-compose.yml => compose.yml} |  2 --
 tests/wordpress/run.sh                              | 10 +++++-----
 15 files changed, 30 insertions(+), 44 deletions(-)
 rename tests/basic/{docker-compose.yml => compose.yml} (96%)
 rename tests/drupal/10/{docker-compose.yml => compose.yml} (97%)
 rename tests/drupal/7/{docker-compose.yml => compose.yml} (97%)
 rename tests/drupal/9/{docker-compose.yml => compose.yml} (97%)
 rename tests/matomo/{docker-compose.yml => compose.yml} (96%)
 rename tests/php/{docker-compose.yml => compose.yml} (93%)
 rename tests/wordpress/{docker-compose.yml => compose.yml} (96%)

diff --git a/README.md b/README.md
index 0524ba6..9192311 100644
--- a/README.md
+++ b/README.md
@@ -220,7 +220,7 @@ Applied to all presets by default, can be disabled via `$NGINX_VHOST_NO_DEFAULTS
 
 - Pass real IP from a reverse proxy via `$NGINX_SET_REAL_IP_FROM`, e.g. `172.17.0.0/16` for docker network
 - Pass multiple real IP from reverse proxies via `$NGINX_SET_REAL_IPS_FROM`
-  In a docker-compose.yml this can be done like this:
+  In a `compose.yml` this can be done like this:
   ```
   environment:
     NGINX_SET_REAL_IPS_FROM: "[\"172.17.0.0/16\", \"192.168.0.10\"]"
diff --git a/tests/basic/docker-compose.yml b/tests/basic/compose.yml
similarity index 96%
rename from tests/basic/docker-compose.yml
rename to tests/basic/compose.yml
index d7e1a0a..989ba7b 100644
--- a/tests/basic/docker-compose.yml
+++ b/tests/basic/compose.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE
diff --git a/tests/basic/run.sh b/tests/basic/run.sh
index 7cd2eec..4c26ab7 100755
--- a/tests/basic/run.sh
+++ b/tests/basic/run.sh
@@ -9,20 +9,20 @@ fi
 git_url=https://github.com/wodby/nginx.git
 
 clean_exit() {
-  docker-compose down
+  docker compose down
 }
 trap clean_exit EXIT
 
-docker-compose up -d
+docker compose up -d
 
 run_action() {
-    docker-compose exec -T nginx make "${@:2}" -f /usr/local/bin/actions.mk
+    docker compose exec -T nginx make "${@:2}" -f /usr/local/bin/actions.mk
 }
 
 run_action check-ready max_try=10
 
-docker-compose exec -T nginx tests.sh
-docker-compose down
+docker compose exec -T nginx tests.sh
+docker compose down
 
 cid="$(docker run -d -e NGINX_HTTP2=1 --name "nginx" "${IMAGE}")"
 trap "docker rm -vf $cid > /dev/null" EXIT
diff --git a/tests/drupal/10/docker-compose.yml b/tests/drupal/10/compose.yml
similarity index 97%
rename from tests/drupal/10/docker-compose.yml
rename to tests/drupal/10/compose.yml
index 3981c82..3e0cb3d 100644
--- a/tests/drupal/10/docker-compose.yml
+++ b/tests/drupal/10/compose.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE
diff --git a/tests/drupal/10/run.sh b/tests/drupal/10/run.sh
index d96ca33..3528ec3 100755
--- a/tests/drupal/10/run.sh
+++ b/tests/drupal/10/run.sh
@@ -7,15 +7,15 @@ if [[ -n "${DEBUG}" ]]; then
 fi
 
 nginx_exec() {
-    docker-compose exec -T nginx "${@}"
+    docker compose exec -T nginx "${@}"
 }
 
 clean_exit() {
-  docker-compose down -v
+  docker compose down -v
 }
 trap clean_exit EXIT
 
-docker-compose up -d
+docker compose up -d
 
 nginx_exec make check-ready -f /usr/local/bin/actions.mk
 
diff --git a/tests/drupal/7/docker-compose.yml b/tests/drupal/7/compose.yml
similarity index 97%
rename from tests/drupal/7/docker-compose.yml
rename to tests/drupal/7/compose.yml
index 0cbf049..9afbdaf 100644
--- a/tests/drupal/7/docker-compose.yml
+++ b/tests/drupal/7/compose.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE
diff --git a/tests/drupal/7/run.sh b/tests/drupal/7/run.sh
index 802e1ae..94cea9a 100755
--- a/tests/drupal/7/run.sh
+++ b/tests/drupal/7/run.sh
@@ -7,15 +7,15 @@ if [[ -n "${DEBUG}" ]]; then
 fi
 
 nginx_exec() {
-    docker-compose exec -T nginx "${@}"
+    docker compose exec -T nginx "${@}"
 }
 
 clean_exit() {
-  docker-compose down -v
+  docker compose down -v
 }
 trap clean_exit EXIT
 
-docker-compose up -d
+docker compose up -d
 
 nginx_exec make check-ready -f /usr/local/bin/actions.mk
 
diff --git a/tests/drupal/9/docker-compose.yml b/tests/drupal/9/compose.yml
similarity index 97%
rename from tests/drupal/9/docker-compose.yml
rename to tests/drupal/9/compose.yml
index e73856e..b4c8e28 100644
--- a/tests/drupal/9/docker-compose.yml
+++ b/tests/drupal/9/compose.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE
diff --git a/tests/drupal/9/run.sh b/tests/drupal/9/run.sh
index eb61442..f3f2373 100755
--- a/tests/drupal/9/run.sh
+++ b/tests/drupal/9/run.sh
@@ -7,15 +7,15 @@ if [[ -n "${DEBUG}" ]]; then
 fi
 
 nginx_exec() {
-    docker-compose exec -T nginx "${@}"
+    docker compose exec -T nginx "${@}"
 }
 
 clean_exit() {
-  docker-compose down -v
+  docker compose down -v
 }
 trap clean_exit EXIT
 
-docker-compose up -d
+docker compose up -d
 
 nginx_exec make check-ready -f /usr/local/bin/actions.mk
 
diff --git a/tests/matomo/docker-compose.yml b/tests/matomo/compose.yml
similarity index 96%
rename from tests/matomo/docker-compose.yml
rename to tests/matomo/compose.yml
index 68fc254..b0bb853 100644
--- a/tests/matomo/docker-compose.yml
+++ b/tests/matomo/compose.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE
diff --git a/tests/matomo/run.sh b/tests/matomo/run.sh
index 033bf6e..d594556 100755
--- a/tests/matomo/run.sh
+++ b/tests/matomo/run.sh
@@ -7,19 +7,19 @@ if [[ -n "${DEBUG}" ]]; then
 fi
 
 check_endpoint() {
-    docker-compose exec -T nginx curl -s -S -I "localhost/${1}" | grep -q "${2}"
+    docker compose exec -T nginx curl -s -S -I "localhost/${1}" | grep -q "${2}"
     echo "OK"
 }
 
 clean_exit() {
-  docker-compose down
+  docker compose down
 }
 trap clean_exit EXIT
 
-docker-compose up -d
+docker compose up -d
 
-docker-compose exec -T nginx make check-ready -f /usr/local/bin/actions.mk
-docker-compose exec -T matomo make init -f /usr/local/bin/actions.mk
+docker compose exec -T nginx make check-ready -f /usr/local/bin/actions.mk
+docker compose exec -T matomo make init -f /usr/local/bin/actions.mk
 
 echo -n "Checking homepage endpoint... "
 check_endpoint "" "200 OK"
diff --git a/tests/php/docker-compose.yml b/tests/php/compose.yml
similarity index 93%
rename from tests/php/docker-compose.yml
rename to tests/php/compose.yml
index abae798..f7d0ece 100644
--- a/tests/php/docker-compose.yml
+++ b/tests/php/compose.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE
diff --git a/tests/php/run.sh b/tests/php/run.sh
index e72274e..86aff66 100755
--- a/tests/php/run.sh
+++ b/tests/php/run.sh
@@ -7,15 +7,15 @@ if [[ -n "${DEBUG}" ]]; then
 fi
 
 clean_exit() {
-  docker-compose down
+  docker compose down
 }
 trap clean_exit EXIT
 
-docker-compose up -d
+docker compose up -d
 
-docker-compose exec -T nginx make check-ready max_try=10 -f /usr/local/bin/actions.mk
-docker-compose exec -T php sh -c 'echo "<?php echo '\''Hello World!'\'';" > /var/www/html/index.php'
+docker compose exec -T nginx make check-ready max_try=10 -f /usr/local/bin/actions.mk
+docker compose exec -T php sh -c 'echo "<?php echo '\''Hello World!'\'';" > /var/www/html/index.php'
 
 echo -n "Checking php endpoint... "
-docker-compose exec -T nginx curl -s -S "localhost" | grep -q "Hello World!"
+docker compose exec -T nginx curl -s -S "localhost" | grep -q "Hello World!"
 echo "OK"
diff --git a/tests/wordpress/docker-compose.yml b/tests/wordpress/compose.yml
similarity index 96%
rename from tests/wordpress/docker-compose.yml
rename to tests/wordpress/compose.yml
index 2d24e62..e41235a 100644
--- a/tests/wordpress/docker-compose.yml
+++ b/tests/wordpress/compose.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE
diff --git a/tests/wordpress/run.sh b/tests/wordpress/run.sh
index 8bb7a42..fd3d9f0 100755
--- a/tests/wordpress/run.sh
+++ b/tests/wordpress/run.sh
@@ -7,19 +7,19 @@ if [[ -n "${DEBUG}" ]]; then
 fi
 
 check_endpoint() {
-    docker-compose exec -T nginx curl -s -S -I "localhost/${1}" | grep -q "${2}"
+    docker compose exec -T nginx curl -s -S -I "localhost/${1}" | grep -q "${2}"
     echo "OK"
 }
 
 clean_exit() {
-  docker-compose down
+  docker compose down
 }
 trap clean_exit EXIT
 
-docker-compose up -d
+docker compose up -d
 
-docker-compose exec -T nginx make check-ready -f /usr/local/bin/actions.mk
-docker-compose exec -T wordpress make init -f /usr/local/bin/actions.mk
+docker compose exec -T nginx make check-ready -f /usr/local/bin/actions.mk
+docker compose exec -T wordpress make init -f /usr/local/bin/actions.mk
 
 echo -n "Checking homepage endpoint... "
 check_endpoint "" "302 Found"