Migrate docker-compose to new format

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\"]"

tests/basic/docker-compose.yml → tests/basic/compose.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE

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

tests/drupal/10/docker-compose.yml → tests/drupal/10/compose.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE

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
 

tests/drupal/7/docker-compose.yml → tests/drupal/7/compose.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE

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
 

tests/drupal/9/docker-compose.yml → tests/drupal/9/compose.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE

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
 

tests/matomo/docker-compose.yml → tests/matomo/compose.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE

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"

tests/php/docker-compose.yml → tests/php/compose.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE

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"

tests/wordpress/docker-compose.yml → tests/wordpress/compose.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx:
     image: $IMAGE

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"