💚 [#509] Use master branch in quickstart job

maykinmedia · Jan 3, 2025 · a8de600 · a8de600
1 parent 7cc13fb
commit a8de600
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/quick-start.yml b/.github/workflows/quick-start.yml
@@ -8,9 +8,20 @@ jobs:
     steps:
       - name: Download docker-compose file
         # todo replace branch name with master after the change is merge
-        run: wget https://raw.githubusercontent.com/maykinmedia/objects-api/deps/oaf-0.8.0/docker-compose.yml
+        run: wget https://raw.githubusercontent.com/maykinmedia/objects-api/master/docker-compose.yml
+      - name: Download setup-configuration data file
+        run: wget -P docker/setup_configuration https://raw.githubusercontent.com/maykinmedia/objects-api/issue/fix-quickstart-job/docker/setup_configuration/data.yaml
       - name: Start docker containers
         run: docker compose up -d --no-build
+      - name: Wait for migrations to finish
+        run: |
+          echo "Waiting for migrations to complete..."
+          until ! docker compose exec -T web src/manage.py showmigrations | grep -q '\[ \]'; do
+            echo "Migrations not finished, waiting..."
+            sleep 3
+          done
+      - name: Show web-init logs
+        run: docker compose logs web-init
       - name: Load fixtures
         run: docker compose exec -T web src/manage.py loaddata demodata
       - name: Create superuser

diff --git a/docker/setup_configuration/data.yaml b/docker/setup_configuration/data.yaml
@@ -4,7 +4,7 @@ sites_config:
   - domain: example.com
     name: Example site
 
-    
+
 zgw_consumers_config_enable: true
 zgw_consumers:
   services:
@@ -58,17 +58,18 @@ tokenauth:
       application: Application 1
       administration: Administration 1
       permissions:
-        - object_type: b427ef84-189d-43aa-9efd-7bb2c459e281
-          mode: read_and_write
         - object_type: b0e8553f-8b1a-4d55-ab90-6d02f1bcf2c2
           mode: read_only
           use_fields: true
           fields:
             '1':
               - record__data__leeftijd
               - record__data__kiemjaar
-
-
+        # additional permissions can be added like this:
+        # - object_type: b427ef84-189d-43aa-9efd-7bb2c459e281
+        #   mode: read_and_write
+
+
 oidc_db_config_enable: true
 oidc_db_config_admin_auth:
   items: