From 9d9029f712df151613f5a4ea090f48f0546f15d9 Mon Sep 17 00:00:00 2001
From: Geoffrey Booth <webadmin@geoffreybooth.com>
Date: Sat, 8 Feb 2025 15:27:51 -0800
Subject: [PATCH] Rename compose.yml, remove deprecated syntax

---
 example/.gitignore                          |  2 +-
 example/{docker-compose.yml => compose.yml} |  2 --
 test.sh                                     | 16 ++++++++--------
 3 files changed, 9 insertions(+), 11 deletions(-)
 rename example/{docker-compose.yml => compose.yml} (96%)

diff --git a/example/.gitignore b/example/.gitignore
index 6e3a968..af53998 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -1,3 +1,3 @@
 test-app/
-test.docker-compose.yml
+test.compose.yml
 test.dockerfile
diff --git a/example/docker-compose.yml b/example/compose.yml
similarity index 96%
rename from example/docker-compose.yml
rename to example/compose.yml
index e30b0b3..66a6e04 100644
--- a/example/docker-compose.yml
+++ b/example/compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   app:
     build:
diff --git a/test.sh b/test.sh
index aff9640..ea11fd3 100755
--- a/test.sh
+++ b/test.sh
@@ -28,7 +28,7 @@ for version in "${meteor_versions[@]}"; do
 	SECONDS=0
 
 	rm -f test.dockerfile
-	rm -f test.docker-compose.yml
+	rm -f test.compose.yml
 	rm -rf test-app
 
 	dockerfile='default.dockerfile'
@@ -50,16 +50,16 @@ for version in "${meteor_versions[@]}"; do
 
 	do_sed "s|/app|/test-app|g" test.dockerfile
 
-	cp docker-compose.yml test.docker-compose.yml
-	do_sed 's|dockerfile: Dockerfile|dockerfile: test.dockerfile|' test.docker-compose.yml
+	cp compose.yml test.compose.yml
+	do_sed 's|dockerfile: Dockerfile|dockerfile: test.dockerfile|' test.compose.yml
 
 	echo 'Building test app Docker image...'
-	run_with_suppressed_output 'docker compose --file test.docker-compose.yml build'
+	run_with_suppressed_output 'docker compose --file test.compose.yml build'
 
 	echo 'Launching test app...'
-	run_with_suppressed_output 'docker compose --file test.docker-compose.yml up --detach'
+	run_with_suppressed_output 'docker compose --file test.compose.yml up --detach'
 
-	# Poll until docker-compose network ready, timing out after 20 seconds
+	# Poll until docker compose network ready, timing out after 20 seconds
 	for i in {1..20}; do
 		(curl --silent --fail http://localhost/ | grep __meteor_runtime_config__) > /dev/null 2>&1 && break || {
 			if [ "$i" -lt 21 ]; then
@@ -96,11 +96,11 @@ for version in "${meteor_versions[@]}"; do
 	fi
 
 	if [ "${SKIP_CLEANUP:-}" != 1 ]; then
-		run_with_suppressed_output 'docker compose --file test.docker-compose.yml down'
+		run_with_suppressed_output 'docker compose --file test.compose.yml down'
 		run_with_suppressed_output 'docker rmi example-app:latest'
 
 		rm -f test.dockerfile
-		rm -f test.docker-compose.yml
+		rm -f test.compose.yml
 		rm -rf test-app
 	fi
 done