🐳 [#4788] Update setup_configuration docker setup

identifiers were added instead of slugs, and the selftest functionality has been removed

bin/setup_configuration.sh

@@ -9,14 +9,8 @@ if [[ "${RUN_SETUP_CONFIG,,}" =~ ^(true|1|yes)$ ]]; then
     # wait for required services
     ${SCRIPTPATH}/wait_for_db.sh
 
-    if [[ "${SKIP_SELFTEST,,}" =~ ^(true|1|yes)$ ]]; then
-        NO_SELFTEST_FLAG="--no-selftest"
-    else
-        NO_SELFTEST_FLAG=""
-    fi
-
     src/manage.py migrate
-    src/manage.py setup_configuration $NO_SELFTEST_FLAG \
+    src/manage.py setup_configuration \
                     --yaml-file data/services.yaml \
                     --yaml-file data/objects_api.yaml
 fi

docker-compose.yml

@@ -87,7 +87,6 @@ services:
       - ENVIRONMENT_FOREGROUND_COLOR=white
       # Django-setup-configuration
       - RUN_SETUP_CONFIG=${RUN_SETUP_CONFIG:-True}
-      - SKIP_SELFTEST=${SKIP_SELFTEST:-False}
     volumes: &web_volumes
       - media:/app/media
       - private_media:/app/private_media
@@ -97,16 +96,14 @@ services:
     ports:
       - 8000:8000
     depends_on:
-      db:
-        condition: service_started
-      redis:
-        condition: service_started
-      smtp:
-        condition: service_started
-      clamav:
-        condition: service_started
-      web-init:
-        condition: service_completed_successfully
+      - db
+      - redis
+      - smtp
+      - clamav
+      # The following pattern can be used to let the web container start after
+      # setup-configuration is done running
+      # web-init:
+      #   condition: service_completed_successfully
     networks:
       - open-forms-dev
 

docker/setup_configuration/objects_api.yaml

@@ -1,22 +1,24 @@
-OBJECTS_API_CONFIG_ENABLE: True
-OBJECTS_API:
+objects_api_config_enable: True
+objects_api:
   groups:
   - name: Config 1
-    objects_service_slug: objecten-test
-    objecttypes_service_slug: objecttypen-test
-    drc_service_slug: documenten-test
-    catalogi_service_slug: catalogi-test
+    identifier: config-1
+    objects_service_identifier: objecten-test
+    objecttypes_service_identifier: objecttypen-test
+    drc_service_identifier: documenten-test
+    catalogi_service_identifier: catalogi-test
     catalogue_domain: TEST
     catalogue_rsin: "000000000"
     organisatie_rsin: "000000000"
     iot_submission_report: PDF Informatieobjecttype
     iot_submission_csv: CSV Informatieobjecttype
     iot_attachment: Attachment Informatieobjecttype
   - name: Config 2
-    objects_service_slug: objecten-test
-    objecttypes_service_slug: objecttypen-test
-    drc_service_slug: documenten-test
-    catalogi_service_slug: catalogi-test
+    identifier: config-2
+    objects_service_identifier: objecten-test
+    objecttypes_service_identifier: objecttypen-test
+    drc_service_identifier: documenten-test
+    catalogi_service_identifier: catalogi-test
     catalogue_domain: OTHER
     catalogue_rsin: "000000000"
     organisatie_rsin: "000000000"

docker/setup_configuration/services.yaml

@@ -1,28 +1,28 @@
-ZGW_CONSUMERS_CONFIG_ENABLE: True
-ZGW_CONSUMERS:
+zgw_consumers_config_enable: True
+zgw_consumers:
   services:
-  - slug: objecttypen-test
+  - identifier: objecttypen-test
     label: Objecttypen API test
     api_root: http://objecttypes-web:8000/api/v2/
     api_type: orc
     auth_type: api_key
     header_key: Authorization
     header_value: Token 171be5abaf41e7856b423ad513df1ef8f867ff48
-  - slug: objecten-test
+  - identifier: objecten-test
     label: Objecten API test
     api_root: http://objects-web:8000/api/v2/
     api_type: orc
     auth_type: api_key
     header_key: Authorization
     header_value: Token 7657474c3d75f56ae0abd0d1bf7994b09964dca9
-  - slug: documenten-test
+  - identifier: documenten-test
     label: Documenten API test
     api_root: http://openzaak-web.local:8000/documenten/api/v1/
     api_type: drc
     auth_type: zgw
     client_id: test_client_id
     secret: test_secret_key
-  - slug: catalogi-test
+  - identifier: catalogi-test
     label: Catalogi API test
     api_root: http://openzaak-web.local:8000/catalogi/api/v1/
     api_type: ztc