fix build

Amsterdam · Aug 5, 2024 · 7f597dc · 7f597dc
1 parent bb47bdf
commit 7f597dc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -22,7 +22,7 @@ jobs:
 
       - run: docker network create zaken_network
       - run: docker network create top_and_zaak_backend_bridge
-      - run: docker-compose -f docker-compose.local.yml up --detach
+      - run: docker compose -f docker-compose.local.yml up --detach
       # - run: docker-compose -f docker-compose.tests.yml up
       - run: sleep 30
       - run: bash bin/setup_credentials.sh

diff --git a/.github/workflows/main.workflow.yml b/.github/workflows/main.workflow.yml
@@ -17,12 +17,12 @@ jobs:
     - name: Linting
       run: bash bin/cleanup_pre_commit.sh
     - name: Build Docker image
-      run: docker-compose -f docker-compose.local.yml build
+      run: docker compose -f docker-compose.local.yml build
     - name: Create Docker network
       run: docker network create zaken_network
     - name: Create TOP and Zaken Docker network
       run: docker network create top_and_zaak_backend_bridge
     - name: Start images
-      run: docker-compose -f docker-compose.local.yml up -d
+      run: docker compose -f docker-compose.local.yml up -d
     - name: Run Tests
-      run: docker-compose -f docker-compose.local.yml exec -T zaak-gateway python manage.py test
+      run: docker compose -f docker-compose.local.yml exec -T zaak-gateway python manage.py test
diff --git a/bin/setup_user_groups.sh b/bin/setup_user_groups.sh
@@ -33,4 +33,4 @@ group.permissions.add(Permission.objects.get(name=\"Create a new 'Digitaal toezi
 
 (group, _) = UserGroup.objects.get_or_create(name='TOEZICHTHOUDER_DIGITAAL_TOEZICHT', display_name='Toezichthouder - Digitaal toezicht')
 group.permissions.add(Permission.objects.get(name=\"Can read 'Digitaal toezicht'\"))
-group.permissions.add(Permission.objects.get(name=\"Create a new 'Digitaal toezicht' Case\"))" | docker-compose -f docker-compose.local.yml run -T --rm zaak-gateway python manage.py shell
+group.permissions.add(Permission.objects.get(name=\"Create a new 'Digitaal toezicht' Case\"))" | docker compose -f docker-compose.local.yml run -T --rm zaak-gateway python manage.py shell
diff --git a/e2e-tests/fix_models.sh b/e2e-tests/fix_models.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-docker-compose -f docker-compose.local.yml run --rm zaak-gateway python manage.py shell -c "
+docker compose -f docker-compose.local.yml run --rm zaak-gateway python manage.py shell -c "
 from django.contrib.auth import get_user_model
 get_user_model().objects.get_or_create(email='[email protected]', first_name='local', last_name='user')"
 
-docker-compose -f docker-compose.local.yml run --rm zaak-gateway python manage.py shell -c "
+docker compose -f docker-compose.local.yml run --rm zaak-gateway python manage.py shell -c "
 from apps.users.models import User, UserGroup
 from django.contrib.auth.models import Permission
 (group, _) = UserGroup.objects.get_or_create(name='PROJECTHANDHAVER', display_name='Projecthandhaver')
@@ -14,7 +14,7 @@ group.permissions.add(Permission.objects.get(name='Can read gevoelige dossiers')
 user = User.objects.get(email='[email protected]')
 user.groups.add(group)"
 
-docker-compose -f docker-compose.local.yml run --rm zaak-gateway python manage.py shell -c "
+docker compose -f docker-compose.local.yml run --rm zaak-gateway python manage.py shell -c "
 from django_celery_beat.models import PeriodicTask, IntervalSchedule
 schedule, created = IntervalSchedule.objects.get_or_create(every=10, period=IntervalSchedule.SECONDS)
 PeriodicTask.objects.get_or_create(interval=schedule, name='Update workflows', task='apps.workflow.tasks.task_update_workflows')"