Merge pull request #51 from OpenConext/feature/fix-devconf

Fix devconf

Author: baszoetekouw

core/docker-compose.yml

@@ -29,6 +29,7 @@ services:
           - mujina-idp.dev.openconext.local
           - invite.dev.openconext.local
           - sbs.dev.openconext.local
+          - spdashboard.dev.openconext.local
     hostname: haproxy.docker
 
   mariadb:
@@ -62,19 +63,18 @@ services:
       - ./mongo/:/docker-entrypoint-initdb.d/
       - openconext_mongodb:/bitnami/mongodb
     healthcheck:
-      test: ['CMD', 'true']
-      # test:
-      #   [
-      #     "CMD",
-      #     "mongosh",
-      #     "-u",
-      #     "managerw",
-      #     "-p",
-      #     "secret",
-      #     "--eval",
-      #     "db.stats().ok",
-      #     "mongodb://127.0.0.1/manage",
-      #   ]
+      test:
+        [
+          "CMD",
+          "mongosh",
+          "-u",
+          "managerw",
+          "-p",
+          "secret",
+          "--eval",
+          "db.stats().ok",
+          "mongodb://127.0.0.1/manage",
+        ]
       interval: 10s
       timeout: 10s
       retries: 3
@@ -114,6 +114,23 @@ services:
       coreconextdev:
     hostname: profile.docker
 
+  spdashboard:
+    image: ghcr.io/surfnet/sp-dashboard/spdashboard:latest
+    environment:
+      APP_ENV: prod
+    volumes:
+      - ./:/config
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    networks:
+      coreconextdev:
+    hostname: spdashboard.docker
+    depends_on:
+      engine:
+        condition: service_healthy
+      mariadb:
+        condition: service_healthy
+
   mujina-idp:
     image: ghcr.io/openconext/mujina/mujina-idp:8.0.12
     volumes:

core/engine/docker-compose.override.yml

@@ -7,7 +7,6 @@ services:
     image: ghcr.io/openconext/openconext-basecontainers/${ENGINE_PHP_IMAGE:-php72-apache2-node14-composer2:latest}
     volumes:
       - ${ENGINE_CODE_PATH}:/var/www/html
-      - ./engine/parameters.yml:/var/www/html/app/config/parameters.yml
       - ./engine/appconf.conf:/etc/apache2/sites-enabled/appconf.conf
     environment:
       - APP_ENV=${APP_ENV:-dev}

core/engine/parameters.yml

@@ -21,7 +21,7 @@
       "coin:signature_method": "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
     },
     "allowedEntities": [],
-    "metadataurl": "https://teams.test2.surfconext.nl/saml/metadata",
+    "metadataurl": "https://teams.dev.surfconext.nl/saml/metadata",
     "revisionnote": "Initial import"
   }
 }

core/scripts/spdashboard.json

@@ -20,7 +20,7 @@
       "coin:signature_method": "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
     },
     "allowedEntities": [],
-    "metadataurl": "https://teams.test2.surfconext.nl/Shibboleth.sso/Metadata",
+    "metadataurl": "https://teams.dev.surfconext.nl/Shibboleth.sso/Metadata",
     "revisionnote": "Initial import"
   }
 }

core/scripts/teams.json

@@ -0,0 +1,12 @@
+---
+services:
+  spdashboard:
+    image: ghcr.io/openconext/openconext-basecontainers/${SPDASHBOARD_PHP_IMAGE:-php82-apache2-node20-composer2:latest}
+    volumes:
+      - ${SPDASHBOARD_CODE_PATH}:/var/www/html
+    environment:
+      - APP_ENV=${APP_ENV:-dev}
+      - APP_DEBUG=true
+    extra_hosts:
+      # Ensure that host.docker.internal is correctly defined on Linux
+      - host.docker.internal:host-gateway

core/spdashboard/docker-compose.override.yml

@@ -3,5 +3,5 @@
 # Use docker compose to start the environment but with the modified override file(s)
 echo -e "Starting the dev environment with the following command:\n"
 
-echo -e "docker compose --profile oidc -f docker-compose.yml down\n"
-docker compose --profile oidc -f docker-compose.yml down
+echo -e "docker compose --profile \"*\" -f docker-compose.yml down\n"
+docker compose --profile "*" -f docker-compose.yml down