Skip to content

Commit

Permalink
github: Replace deprecated docker-compose calls
Browse files Browse the repository at this point in the history
The command is not available anymore on the build hosts.
  • Loading branch information
tobiasbrunner committed Aug 8, 2024
1 parent 6bc58a8 commit 0dc409c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ jobs:
echo "PATH=$HOME/.local/bin:$PATH" >> $GITHUB_ENV
- name: Build Docker images and start containers
run: |
docker-compose build
docker-compose up -d
docker compose build
docker compose up -d
sleep 5
- name: Run unit tests, collect coverage
run: docker-compose exec -T roadwarrior /bin/sh -c "cd /strongMan; ./runtests.py"
run: docker compose exec -T roadwarrior /bin/sh -c "cd /strongMan; ./runtests.py"
- name: Run integration tests
run: docker-compose exec -T roadwarrior /bin/sh -c "cd /strongMan; python manage.py test strongMan.tests.integration_tests --settings=strongMan.settings.local;"
run: docker compose exec -T roadwarrior /bin/sh -c "cd /strongMan; python manage.py test strongMan.tests.integration_tests --settings=strongMan.settings.local;"
- name: Submit coverage
if: ${{ success() }}
run: |
docker-compose exec -T roadwarrior cat /strongMan/.coverage > .coverage
docker compose exec -T roadwarrior cat /strongMan/.coverage > .coverage
coveralls --service=github
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.1'

services:
gateway:
command: "ipsec start --nofork"
Expand Down

0 comments on commit 0dc409c

Please sign in to comment.