File tree Expand file tree Collapse file tree 1 file changed +3
-4
lines changed
ee/packages/federation-matrix/tests/scripts Expand file tree Collapse file tree 1 file changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,6 @@ PACKAGE_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")"
2020DOCKER_COMPOSE_FILE=" $PACKAGE_ROOT /docker-compose.test.yml"
2121MAX_WAIT_TIME=240 # 4 minutes
2222CHECK_INTERVAL=5 # Check every 5 seconds
23- RC1_CONTAINER=" rc1"
2423
2524# Build configuration
2625# Use a temporary directory outside the repo to avoid symlink traversal issues during Meteor build
@@ -261,7 +260,7 @@ if [ "$START_CONTAINERS" = true ]; then
261260 log_info " Waiting for rc1 container to start..."
262261 timeout=60
263262 while [ $timeout -gt 0 ] && [ " $INTERRUPTED " = false ]; do
264- if docker ps --filter " name= $RC1_CONTAINER " --filter " status=running" | grep -q " $RC1_CONTAINER " ; then
263+ if docker compose -f " $DOCKER_COMPOSE_FILE " ps rc1 --filter " status=running" | grep -q " rc1 " ; then
265264 log_success " rc1 container is running"
266265 break
267266 fi
@@ -337,14 +336,14 @@ if [ "$START_CONTAINERS" = true ]; then
337336 # Wait for Rocket.Chat
338337 if ! wait_for_service " https://rc1/api/info" " Rocket.Chat" " rc1" ; then
339338 log_error " Last 50 lines of rc1 logs:"
340- docker logs --tail 50 " $RC1_CONTAINER " 2>&1 | sed ' s/^/ / '
339+ docker compose -f " $DOCKER_COMPOSE_FILE " logs --tail 50 rc1
341340 exit 1
342341 fi
343342
344343 # Wait for Synapse
345344 if ! wait_for_service " https://hs1/_matrix/client/versions" " Synapse" " hs1" ; then
346345 log_error " Last 50 lines of hs1 logs:"
347- docker logs --tail 50 " hs1 " 2>&1 | sed ' s/^/ / '
346+ docker compose -f " $DOCKER_COMPOSE_FILE " logs --tail 50 hs1
348347 exit 1
349348 fi
350349fi
You can’t perform that action at this time.
0 commit comments