Skip to content

Commit 9d9029f

Browse files
committed
Rename compose.yml, remove deprecated syntax
1 parent b1567a8 commit 9d9029f

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

example/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
test-app/
2-
test.docker-compose.yml
2+
test.compose.yml
33
test.dockerfile

example/docker-compose.yml example/compose.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3'
2-
31
services:
42
app:
53
build:

test.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ for version in "${meteor_versions[@]}"; do
2828
SECONDS=0
2929

3030
rm -f test.dockerfile
31-
rm -f test.docker-compose.yml
31+
rm -f test.compose.yml
3232
rm -rf test-app
3333

3434
dockerfile='default.dockerfile'
@@ -50,16 +50,16 @@ for version in "${meteor_versions[@]}"; do
5050

5151
do_sed "s|/app|/test-app|g" test.dockerfile
5252

53-
cp docker-compose.yml test.docker-compose.yml
54-
do_sed 's|dockerfile: Dockerfile|dockerfile: test.dockerfile|' test.docker-compose.yml
53+
cp compose.yml test.compose.yml
54+
do_sed 's|dockerfile: Dockerfile|dockerfile: test.dockerfile|' test.compose.yml
5555

5656
echo 'Building test app Docker image...'
57-
run_with_suppressed_output 'docker compose --file test.docker-compose.yml build'
57+
run_with_suppressed_output 'docker compose --file test.compose.yml build'
5858

5959
echo 'Launching test app...'
60-
run_with_suppressed_output 'docker compose --file test.docker-compose.yml up --detach'
60+
run_with_suppressed_output 'docker compose --file test.compose.yml up --detach'
6161

62-
# Poll until docker-compose network ready, timing out after 20 seconds
62+
# Poll until docker compose network ready, timing out after 20 seconds
6363
for i in {1..20}; do
6464
(curl --silent --fail http://localhost/ | grep __meteor_runtime_config__) > /dev/null 2>&1 && break || {
6565
if [ "$i" -lt 21 ]; then
@@ -96,11 +96,11 @@ for version in "${meteor_versions[@]}"; do
9696
fi
9797

9898
if [ "${SKIP_CLEANUP:-}" != 1 ]; then
99-
run_with_suppressed_output 'docker compose --file test.docker-compose.yml down'
99+
run_with_suppressed_output 'docker compose --file test.compose.yml down'
100100
run_with_suppressed_output 'docker rmi example-app:latest'
101101

102102
rm -f test.dockerfile
103-
rm -f test.docker-compose.yml
103+
rm -f test.compose.yml
104104
rm -rf test-app
105105
fi
106106
done

0 commit comments

Comments
 (0)