Skip to content

Commit

Permalink
replace dc commands
Browse files Browse the repository at this point in the history
  • Loading branch information
NvdLaan committed Aug 5, 2024
1 parent 7f597dc commit c898783
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
1 change: 0 additions & 1 deletion .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ 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.tests.yml up
- run: sleep 30
- run: bash bin/setup_credentials.sh
- run: ./e2e-tests/fix_models.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- run: docker network create top_and_zaak_backend_bridge
working-directory: backend

- run: docker-compose -f docker-compose.local.yml up --build --detach
- run: docker compose -f docker-compose.local.yml up --build --detach
working-directory: backend

###################################################
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ First, make sure you have built the project and executed the database migrations
```bash
docker network create top_and_zaak_backend_bridge
docker network create zaken_network
docker-compose -f docker-compose.local.yml build
docker compose -f docker-compose.local.yml build
```

Start AZA backend:

```bash
docker-compose -f docker-compose.local.yml up
docker compose -f docker-compose.local.yml up
```

To create all necessary credentials run the following command:
Expand Down Expand Up @@ -95,7 +95,7 @@ docker compose -f docker-compose.local.yml run --rm zaak-gateway python manage.p
Or a specific test:

```bash
docker-compose -f docker-compose.local.yml exec -T zaak-gateway python manage.py test apps.addresses.tests.tests_models.AddressModelTest.test_can_create_address_with_bag_result_without_stadsdeel
docker compose -f docker-compose.local.yml exec -T zaak-gateway python manage.py test apps.addresses.tests.tests_models.AddressModelTest.test_can_create_address_with_bag_result_without_stadsdeel
```


Expand Down Expand Up @@ -173,7 +173,7 @@ To improve reliability, the health checks should be expanded for each essential
It's possible to generate a graph of the datamodel using the following command:

```
docker-compose run --rm zaak-gateway python manage.py graph_models cases debriefings permits fines addresses events visits summons -X ModelEventEmitter,ModelEditableTimeConstraint,ModelEditablelBase --pygraphviz -o diagram.png
docker compose run --rm zaak-gateway python manage.py graph_models cases debriefings permits fines addresses events visits summons -X ModelEventEmitter,ModelEditableTimeConstraint,ModelEditablelBase --pygraphviz -o diagram.png
```

Note that the apps and models should be updated whenever applications and models are added or modified.
Expand Down
2 changes: 1 addition & 1 deletion bin/setup_credentials.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Creates a superuser for the zaak-gateway backend
echo "from django.contrib.auth import get_user_model; get_user_model().objects.create_superuser('[email protected]', 'insecure')" | docker-compose -f docker-compose.local.yml run -T --rm zaak-gateway python manage.py shell
echo "from django.contrib.auth import get_user_model; get_user_model().objects.create_superuser('[email protected]', 'insecure')" | docker compose -f docker-compose.local.yml run -T --rm zaak-gateway python manage.py shell
8 changes: 4 additions & 4 deletions e2e-tests/setup_or_reset_and_start.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#!/bin/bash

docker-compose down
docker compose down

docker volume rm $(docker volume ls -q)

docker-compose -f ../docker-compose.local.yml build
docker compose -f ../docker-compose.local.yml build

docker-compose run --rm zaak-gateway python manage.py migrate
docker compose run --rm zaak-gateway python manage.py migrate

bash ../bin/setup_credentials.sh

./fix_models.sh

docker-compose -f ../docker-compose.local.yml up
docker compose -f ../docker-compose.local.yml up

0 comments on commit c898783

Please sign in to comment.