Skip to content

Commit a25eeed

Browse files
authored
Merge pull request #1 from OpenConext/local-code-mounting
Adding the files needed to allow the devs to mount their local code
2 parents 5c832c7 + 1397cb2 commit a25eeed

File tree

10 files changed

+45
-4
lines changed

10 files changed

+45
-4
lines changed

stepup/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Then the webauthn db
3838
docker compose exec webauthn /var/www/html/bin/console doctrine:migrations:migrate --env=prod
3939
4040
```
41+
4142
Then you will need to provision the middleware config:
4243
```
4344
cd middleware

stepup/docker-compose.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ services:
1313
- middleware.dev.openconext.local
1414
- gateway.dev.openconext.local
1515

16-
1716
mariadb:
1817
image: mariadb:10.6
1918
environment:
@@ -36,8 +35,8 @@ services:
3635
- ${PWD}/:/config
3736
networks:
3837
openconextdev:
39-
40-
ssp:
38+
39+
ssp:
4140
image: ghcr.io/openconext/openconext-devssp/devssp:latest
4241
networks:
4342
openconextdev:
@@ -64,7 +63,7 @@ services:
6463
- ${PWD}/:/config
6564
- /dev/log:/dev/log
6665
- ${PWD}/gateway/surfnet_yubikey.yaml:/var/www/html/config/packages/surfnet_yubikey.yaml
67-
66+
6867
ra:
6968
image: ghcr.io/openconext/stepup-ra/stepup-ra:prod
7069
environment:
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
services:
2+
gateway:
3+
image: ghcr.io/openconext/stepup-gateway/stepup-gateway:dev
4+
volumes:
5+
- ${CODE_PATH}:/var/www/html
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
services:
2+
middleware:
3+
image: ghcr.io/openconext/stepup-middleware/stepup-middleware:dev
4+
volumes:
5+
- ${CODE_PATH}:/var/www/html

stepup/middleware/middleware-institution.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"allowed_second_factors": [],
1616
"number_of_tokens_per_identity": 2,
1717
"self_vet": true,
18+
"sso_on_2fa": true,
1819
"allow_self_asserted_tokens": true
1920
},
2021
"institution-b.example.com": {
@@ -24,6 +25,7 @@
2425
"allowed_second_factors": [],
2526
"number_of_tokens_per_identity": 2,
2627
"self_vet": false,
28+
"sso_on_2fa": true,
2729
"allow_self_asserted_tokens": true
2830
},
2931
"institution-d.example.com": {
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
services:
2+
ra:
3+
image: ghcr.io/openconext/stepup-ra/stepup-ra:dev
4+
volumes:
5+
- ${CODE_PATH}:/var/www/html
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
services:
2+
selfservice:
3+
image: ghcr.io/openconext/stepup-selfservice/stepup-selfservice:dev
4+
volumes:
5+
- ${CODE_PATH}:/var/www/html
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
services:
2+
ssp:
3+
volumes:
4+
- ${CODE_PATH}:/var/www/html

stepup/start-dev-env.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
# Read the command line parameters to configure the dev env
4+
export SERVICE=$1
5+
export CODE_PATH=$2
6+
7+
# Use docker compose to start the environment but with the modified override file
8+
echo -e "Starting the dev environment with the following command:\n"
9+
echo -e "docker compose -f docker-compose.yml -f ./${SERVICE}/docker-compose.override.yml up "${@:3}"\n"
10+
docker compose -f docker-compose.yml -f ./${SERVICE}/docker-compose.override.yml up "${@:3}"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
services:
2+
webauthn:
3+
image: ghcr.io/openconext/stepup-webauthn/stepup-webauthn:dev
4+
volumes:
5+
- ${CODE_PATH}:/var/www/html

0 commit comments

Comments
 (0)