Skip to content

Commit b0cd666

Browse files
committed
More docker compose CI fixes
1 parent 888b381 commit b0cd666

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/auth-server/tests/run.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ cd $SCRIPT_PATH/../../..
66

77
if ! [[ "$(docker container inspect -f '{{.State.Running}}' orion_db)" = "true" ]]; then
88
docker network create joystream_default || true
9-
docker-compose up -d orion_db
10-
until docker-compose logs orion_db | grep "database system is ready to accept connections"; do
11-
docker-compose logs --tail 10 orion_db
9+
docker compose up -d orion_db
10+
until docker compose logs orion_db | grep "database system is ready to accept connections"; do
11+
docker compose logs --tail 10 orion_db
1212
echo "Waiting for the db to be ready..."
1313
sleep 1
1414
done

src/mail-scheduler/tests/run-tests.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ cd $SCRIPT_PATH/../../..
66

77
if ! [[ "$(docker container inspect -f '{{.State.Running}}' orion_db)" = "true" ]]; then
88
docker network create joystream_default || true
9-
docker-compose up -d orion_db
10-
docker-compose up -d orion_processor # We need the processor to run the migrations
11-
until docker-compose logs orion_db | grep "database system is ready to accept connections" >/dev/null; do
9+
docker compose up -d orion_db
10+
docker compose up -d orion_processor # We need the processor to run the migrations
11+
until docker compose logs orion_db | grep "database system is ready to accept connections" >/dev/null; do
1212
sleep 1
1313
done
1414
fi
1515

1616
sleep 10
1717

1818
cleanup() {
19-
docker-compose down -v
19+
docker compose down -v
2020
}
2121

2222
# Run the tests

src/tests/integration/run.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ cd $SCRIPT_PATH/../../..
66

77
if ! [[ "$(docker container inspect -f '{{.State.Running}}' orion_db)" = "true" ]]; then
88
docker network create joystream_default || true
9-
docker-compose up -d orion_db &
9+
docker compose up -d orion_db &
1010
2>/dev/null
11-
until docker-compose logs orion_db | grep "database system is ready to accept connections" >/dev/null; do
11+
until docker compose logs orion_db | grep "database system is ready to accept connections" >/dev/null; do
1212
echo "Waiting for the db to be ready..."
1313
sleep 1
1414
done
1515
make migrate >/dev/null
1616
fi
1717

1818
cleanup() {
19-
docker-compose down -v
19+
docker compose down -v
2020
}
2121

2222
# Run the tests

0 commit comments

Comments
 (0)