status-im
/
spiff-arena
mirror of https://github.com/status-im/spiff-arena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c24cc56fb00e07f6cfe16840c65471443b120daf'

This commit is contained in:
burnettk 2022-10-27 22:03:49 -04:00
parent ad07f7cc96 c24cc56fb0
commit f7be875f20
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spiffworkflow-backend/bin/spiffworkflow-realm.json
View File

@ -1280,6 +1280,7 @@
"http://localhost:7000/*", "http://localhost:7000/*",
"http://67.205.133.116:7000/*", "http://67.205.133.116:7000/*",
"http://167.172.242.138:7000/*", "http://167.172.242.138:7000/*",
"https://api.{{SPIFF_SUBDOMAIN}}.spiffworkflow.org/*",
"https://api.demo.spiffworkflow.org/*" "https://api.demo.spiffworkflow.org/*"
], ],
"webOrigins": [], "webOrigins": [],
@ -1552,6 +1553,7 @@
"http://localhost:7001/*", "http://localhost:7001/*",
"http://67.205.133.116:7000/*", "http://67.205.133.116:7000/*",
"http://167.172.242.138:7001/*", "http://167.172.242.138:7001/*",
"https://api.{{SPIFF_SUBDOMAIN}}.spiffworkflow.org/*",
"https://api.demo.spiffworkflow.org/*" "https://api.demo.spiffworkflow.org/*"
], ],
"webOrigins": ["*"], "webOrigins": ["*"],
@ -1623,6 +1625,7 @@
"http://localhost:7001/*", "http://localhost:7001/*",
"http://67.205.133.116:7000/*", "http://67.205.133.116:7000/*",
"http://167.172.242.138:7001/*", "http://167.172.242.138:7001/*",
"https://api.{{SPIFF_SUBDOMAIN}}.spiffworkflow.org/*",
"https://api.demo.spiffworkflow.org/*" "https://api.demo.spiffworkflow.org/*"
], ],
"webOrigins": [], "webOrigins": [],

7
spiffworkflow-backend/bin/start_keycloak
View File

@ -18,7 +18,7 @@ set -o errtrace -o errexit -o nounset -o pipefail
if ! docker network inspect spiffworkflow > /dev/null 2>&1; then if ! docker network inspect spiffworkflow > /dev/null 2>&1; then
docker network create spiffworkflow docker network create spiffworkflow
fi fi
docker rm keycloak 2>/dev/null || echo 'no keycloak container found' docker rm keycloak 2>/dev/null || echo 'no keycloak container found, safe to start new container'
docker run \ docker run \
-p 7002:8080 \ -p 7002:8080 \
-d \ -d \
@ -31,7 +31,10 @@ docker run \
-Dkeycloak.profile.feature.token_exchange=enabled \ -Dkeycloak.profile.feature.token_exchange=enabled \
-Dkeycloak.profile.feature.admin_fine_grained_authz=enabled -Dkeycloak.profile.feature.admin_fine_grained_authz=enabled
docker cp bin/spiffworkflow-realm.json keycloak:/tmp cp bin/spiffworkflow-realm.json /tmp/spiffworkflow-realm.json
spiff_subdomain="unused-for-local-dev"
perl -pi -e "s/{{SPIFF_SUBDOMAIN}}/${spiff_subdomain}/g" /tmp/spiffworkflow-realm.json
docker cp /tmp/spiffworkflow-realm.json keycloak:/tmp
sleep 20 sleep 20
remove_traps remove_traps

2
spiffworkflow-backend/keycloak/Dockerfile
View File

@ -6,7 +6,7 @@ ENV KC_HEALTH_ENABLED="true"
# ENV KC_METRICS_ENABLED=true # ENV KC_METRICS_ENABLED=true
ENV PROXY_ADDRESS_FORWARDING="true" ENV PROXY_ADDRESS_FORWARDING="true"
# ENV KC_HOSTNAME="keycloak.demo.spiffworkflow.org" # ENV KC_HOSTNAME="keycloak.demo.spiffworkflow.org"
ENV KC_HOSTNAME_URL="https://keycloak.demo.spiffworkflow.org" # ENV KC_HOSTNAME_URL="https://keycloak.demo.spiffworkflow.org"
ENV KC_FEATURES="token-exchange,admin-fine-grained-authz" ENV KC_FEATURES="token-exchange,admin-fine-grained-authz"
# ENV KC_DB=postgres # ENV KC_DB=postgres
# Install custom providers # Install custom providers

2
spiffworkflow-backend/poetry.lock generated
View File

@ -639,7 +639,7 @@ werkzeug = "*"
type = "git" type = "git"
url = "https://github.com/sartography/flask-bpmn" url = "https://github.com/sartography/flask-bpmn"
reference = "main" reference = "main"
resolved_reference = "a901d7ffb2b79abfec17c332bbe77c43c1d28705" resolved_reference = "cedc5253add81a18a274f2cd3289fe36bb138f8b"
[[package]] [[package]]
name = "Flask-Cors" name = "Flask-Cors"