Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 4 additions & 57 deletions core/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ services:
- voot.dev.openconext.local
- pdp.dev.openconext.local
- aa.dev.openconext.local
- teams.dev.openconext.local
- spdashboard.dev.openconext.local
- mujina-idp.dev.openconext.local
- invite.dev.openconext.local
Expand Down Expand Up @@ -224,7 +223,6 @@ services:
condition: service_healthy
profiles:
- "oidc"
- "teams"
- "extras"
- "invite"

Expand All @@ -235,7 +233,6 @@ services:
hostname: oidcplaygroundgui.docker
profiles:
- "oidc"
- "teams"
- "extras"

oidcplaygroundserver:
Expand All @@ -253,49 +250,6 @@ services:
working_dir: /
profiles:
- "oidc"
- "teams"
- "extras"

teamsgui:
image: ghcr.io/openconext/openconext-teams-ng/teams-gui:9.3.1
volumes:
- ./:/config
environment:
HTTPD_CSP: ""
HTTPD_SERVERNAME: "teams.dev.openconext.local"
OPENCONEXT_INSTANCENAME: "OpenConext dev"
OPENCONEXT_ENGINE_LOGOUT_URL: "https://engine.dev.openconext.local/logout"
OPENCONEXT_HELP_EMAIL: "support@openconext.org"
SHIB_ENTITYID: "https://teams.dev.openconext.local/shibboleth"
SHIB_REMOTE_ENTITYID: "https://engine.dev.openconext.local/authentication/idp/metadata"
SHIB_REMOTE_METADATA: "https://engine.dev.openconext.local/authentication/idp/metadata"
networks:
coreconextdev:
hostname: teamsgui.docker
depends_on:
engine:
condition: service_healthy
mariadb:
condition: service_healthy
profiles:
- "teams"
- "extras"

teamsserver:
image: ghcr.io/openconext/openconext-teams-ng/teams-server:9.3.1
environment:
USE_SYSTEM_CA_CERTS: true
volumes:
- ./haproxy/haproxy.crt:/certificates/haproxy.crt
- ./cacert/__cacert_entrypoint.sh:/__cacert_entrypoint.sh
networks:
coreconextdev:
entrypoint: /__cacert_entrypoint.sh
command: "java -jar app.jar --spring.profiles.active=devconf"
hostname: teamsserver.docker
working_dir: /
profiles:
- "teams"
- "extras"

inviteserver:
Expand All @@ -318,7 +272,6 @@ services:
working_dir: /
profiles:
- "php"
- "teams"
- "extras"
- "invite"

Expand All @@ -341,7 +294,6 @@ services:
condition: service_started
profiles:
- "extras"
- "teams"
- "invite"

invitewelcome:
Expand All @@ -363,11 +315,10 @@ services:
condition: service_started
profiles:
- "extras"
- "teams"
- "invite"

voot:
image: ghcr.io/openconext/openconext-voot/voot:6.2.0
image: ghcr.io/openconext/openconext-voot/voot:7.0.1
environment:
USE_SYSTEM_CA_CERTS: true
networks:
Expand All @@ -380,10 +331,9 @@ services:
hostname: voot.docker
working_dir: /
profiles:
- "teams"
- "extras"
aa:
image: ghcr.io/openconext/openconext-attribute-aggregation/aa-server:3.2.0
image: ghcr.io/openconext/openconext-attribute-aggregation/aa-server:5.1.2
environment:
USE_SYSTEM_CA_CERTS: true
networks:
Expand All @@ -396,12 +346,11 @@ services:
hostname: aa.docker
working_dir: /
profiles:
- "teams"
- "extras"
- "php"

pdpserver:
image: ghcr.io/openconext/openconext-pdp/pdp-server:5.1.0
image: ghcr.io/openconext/openconext-pdp/pdp-server:7.6.0
environment:
USE_SYSTEM_CA_CERTS: true
networks:
Expand All @@ -416,10 +365,9 @@ services:
working_dir: /
profiles:
- "extras"
- "teams"

pdpgui:
image: ghcr.io/openconext/openconext-pdp/pdp-gui:5.1.0
image: ghcr.io/openconext/openconext-pdp/pdp-gui:7.6.0
volumes:
- ./:/config
environment:
Expand All @@ -441,7 +389,6 @@ services:
condition: service_healthy
profiles:
- "extras"
- "teams"

userlifecycle:
image: ghcr.io/openconext/openconext-user-lifecycle/user-lifecycle:prod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Feature: A RAA can view the institution configuration
| Show RAA contact information? | Yes |
| E-mail verification enabled? | Yes |
| Single sign on on second factor authentications? | Yes |
| Single sign on registration bypass? | Yes |
| GSSP Fallback enabled? | Yes |
| Token activation using an activated token | Allowed |
| Activate a token without the service desk or an activated token | Allowed |
| Allowed second factor tokens | All enabled tokens are available |
Expand All @@ -59,7 +59,7 @@ Feature: A RAA can view the institution configuration
| Show RAA contact information? | No |
| E-mail verification enabled? | No |
| Single sign on on second factor authentications? | No |
| Single sign on registration bypass? | No |
| GSSP Fallback enabled? | No |
| Token activation using an activated token | Not allowed |
| Activate a token without the service desk or an activated token | Not allowed |
| Allowed second factor tokens | sms |
Expand Down
Loading