Skip to content

Commit 4471c81

Browse files
authored
Merge pull request #510 from maykinmedia/issue/fix-quickstart-job
💚 [#509] Use correct branch in quickstart job
2 parents 014cfe2 + c6adce9 commit 4471c81

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

.github/workflows/quick-start.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@ jobs:
66
run:
77
runs-on: ubuntu-latest
88
steps:
9-
- name: Download docker-compose file
10-
# todo replace branch name with master after the change is merge
11-
run: wget https://raw.githubusercontent.com/maykinmedia/objects-api/deps/oaf-0.8.0/docker-compose.yml
9+
- uses: actions/checkout@v4
1210
- name: Start docker containers
13-
run: docker compose up -d --no-build
11+
run: docker compose up -d --build
12+
- name: Wait for migrations to finish
13+
run: |
14+
echo "Waiting for migrations to complete..."
15+
until ! docker compose exec -T web src/manage.py showmigrations | grep -q '\[ \]'; do
16+
echo "Migrations not finished, waiting..."
17+
sleep 3
18+
done
19+
- name: Show web-init logs
20+
run: docker compose logs web-init
1421
- name: Load fixtures
1522
run: docker compose exec -T web src/manage.py loaddata demodata
1623
- name: Create superuser

docker/setup_configuration/data.yaml

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ sites_config:
44
- domain: example.com
55
name: Example site
66

7-
7+
88
zgw_consumers_config_enable: true
99
zgw_consumers:
1010
services:
@@ -58,17 +58,18 @@ tokenauth:
5858
application: Application 1
5959
administration: Administration 1
6060
permissions:
61-
- object_type: b427ef84-189d-43aa-9efd-7bb2c459e281
62-
mode: read_and_write
6361
- object_type: b0e8553f-8b1a-4d55-ab90-6d02f1bcf2c2
6462
mode: read_only
6563
use_fields: true
6664
fields:
6765
'1':
6866
- record__data__leeftijd
6967
- record__data__kiemjaar
70-
71-
68+
# additional permissions can be added like this:
69+
# - object_type: b427ef84-189d-43aa-9efd-7bb2c459e281
70+
# mode: read_and_write
71+
72+
7273
oidc_db_config_enable: true
7374
oidc_db_config_admin_auth:
7475
items:

0 commit comments

Comments
 (0)