Skip to content

Commit

Permalink
Fix docker-compose -> docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
thenav56 committed Sep 4, 2024
1 parent ec48ad9 commit d887e89
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ jobs:
env:
DOCKER_IMAGE_SERVER: ${{ steps.prep.outputs.tagged_image }}
run: |
docker-compose -f gh-docker-compose.yml run --rm server wait-for-it db:5432 &&
docker-compose -f gh-docker-compose.yml run --rm server ./manage.py graphql_schema --out /ci-share/schema-latest.graphql &&
docker compose -f gh-docker-compose.yml run --rm server wait-for-it db:5432 &&
docker compose -f gh-docker-compose.yml run --rm server ./manage.py graphql_schema --out /ci-share/schema-latest.graphql &&
cmp --silent schema.graphql ./ci-share/schema-latest.graphql || {
echo 'The schema.graphql is not up to date with the latest changes. Please update and push latest';
diff schema.graphql schema-latest.graphql;
Expand All @@ -60,7 +60,7 @@ jobs:
env:
DOCKER_IMAGE_SERVER: ${{ steps.prep.outputs.tagged_image }}
run: |
docker-compose -f gh-docker-compose.yml run --rm server python3 manage.py makemigrations --check --dry-run || {
docker compose -f gh-docker-compose.yml run --rm server python3 manage.py makemigrations --check --dry-run || {
echo 'There are some changes to be reflected in the migration. Make sure to run makemigrations';
exit 1;
}
Expand All @@ -70,7 +70,7 @@ jobs:
CC_TEST_REPORTER_ID: ${{ secrets.CODE_CLIMATE_ID }}
DOCKER_IMAGE_SERVER: ${{ steps.prep.outputs.tagged_image }}
with:
coverageCommand: docker-compose -f gh-docker-compose.yml run --rm server /code/scripts/run_tests.sh
coverageCommand: docker compose -f gh-docker-compose.yml run --rm server /code/scripts/run_tests.sh
coverageLocations: |
${{github.workspace}}/coverage/coverage.xml:coverage.py
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
## Run development server:

```bash
docker-compose up --build
docker compose up --build
```
4 changes: 2 additions & 2 deletions apps/book/management/commands/import_books_from_csv.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ class Command(BaseCommand):
help = 'Load books from csv'
"""
# WIP: This is for one time use only.
docker-compose exec server ./manage.py loaddata provinces districts municipalities
cat data.csv | docker-compose exec -T server ./manage.py import_books_from_csv http://172.17.0.1:8080
docker compose exec server ./manage.py loaddata provinces districts municipalities
cat data.csv | docker compose exec -T server ./manage.py import_books_from_csv http://172.17.0.1:8080
"""

def add_arguments(self, parser):
Expand Down
2 changes: 1 addition & 1 deletion config/tests/test_fake.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
class FakeTest(TestCase):
"""
This test is for running migrations only
docker-compose run --rm server ./manage.py test -v 2 --pattern="deep/tests/test_fake.py"
docker compose run --rm server ./manage.py test -v 2 --pattern="deep/tests/test_fake.py"
"""
def test_fake(self):
pass

0 comments on commit d887e89

Please sign in to comment.