Skip to content

Commit

Permalink
Sigh, CI keeps randomly failing. Remove Makefile workarounds and force
Browse files Browse the repository at this point in the history
completely sequential creation and start in CI job explicitly.
  • Loading branch information
jonasbardino committed Mar 26, 2024
1 parent c2fd395 commit 2bbaf7d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ jobs:
- name: Start services
run: |
grep -E "DOCKER_MIGRID_ROOT=|MIG_SYSTEM_RUN=" .env
echo "NOTE: use sequential start here to make docker bind mounts behave"
export COMPOSE_PARALLEL_LIMIT=1
make up
- name: Run tests
run: |
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@ initcomposevars:
@sed -E -i 's!^([^=]*)=.*! - \1=\$$\{\1\}!' docker-compose_shared.yml

up: initcomposevars
# IMPORTANT: split up into sequential create and start to avoid racy overlap.
# Concurrent container creation and start breaks nested mounts.
${DOCKER_COMPOSE} --parallel=1 create
${DOCKER_COMPOSE} up -d

down: initcomposevars
Expand Down

0 comments on commit 2bbaf7d

Please sign in to comment.