From 6da2c8e3cea685f2ef54aa56522fd96a460cbf04 Mon Sep 17 00:00:00 2001 From: pedro Date: Fri, 22 Mar 2024 10:36:16 +0100 Subject: [PATCH] pangea pilot: adapt to new env vars --- docker-compose__pilot-pangea.yml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/docker-compose__pilot-pangea.yml b/docker-compose__pilot-pangea.yml index 3b3957e..2450760 100644 --- a/docker-compose__pilot-pangea.yml +++ b/docker-compose__pilot-pangea.yml @@ -41,15 +41,14 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: + - DOMAIN=idhub1.demo.pangea.org + - LANGUAGE_CODE=ca + - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} + - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} - SECRET_KEY=${IDHUB_SECRET_KEY:-publicsecretisnotsecureVtmKBfxpVV47PpBCF2Nzz2H6qnbd} - - ALLOWED_HOSTS=${IDHUB_ALLOWED_HOSTS:-*} - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} - PORT=${IDHUB_PORT:-9001} - - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} - - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} - - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} - - CSRF_TRUSTED_ORIGINS=https://idhub1.demo.pangea.org - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} @@ -57,11 +56,10 @@ services: - EMAIL_PORT=${IDHUB_EMAIL_PORT} - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS} - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND} - - RESPONSE_URI=https://idhub1.demo.pangea.org/oidc4vp/ - - ALLOW_CODE_URI=https://idhub1.demo.pangea.org/oidc4vp/allow_code - SUPPORTED_CREDENTIALS=['MembershipCard'] - SYNC_ORG_DEV=${IDHUB_SYNC_ORG_DEV} - - ORG_FILE=examples/organizations__pilot_pangea.csv + - OIDC_OIRGS=examples/organizations__pilot_pangea.csv + - OIDC_REDIRECT=true ports: - 9031:9001 volumes: @@ -72,15 +70,14 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: + - DOMAIN=idhub2.demo.pangea.org + - LANGUAGE_CODE=ca + - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} + - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} - SECRET_KEY=${IDHUB_SECRET_KEY:-publicsecretisnotsecureVtmKBfxpVV47PpBCF2Nzz2H6qnbd} - - ALLOWED_HOSTS=${IDHUB_ALLOWED_HOSTS:-*} - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} - PORT=${IDHUB_PORT:-9002} - - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} - - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} - - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} - - CSRF_TRUSTED_ORIGINS=https://idhub2.demo.pangea.org - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} @@ -88,11 +85,10 @@ services: - EMAIL_PORT=${IDHUB_EMAIL_PORT} - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS} - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND} - - RESPONSE_URI=https://idhub2.demo.pangea.org/oidc4vp/ - - ALLOW_CODE_URI=https://idhub2.demo.pangea.org/oidc4vp/allow_code - SUPPORTED_CREDENTIALS=['MembershipCard'] - SYNC_ORG_DEV=${IDHUB_SYNC_ORG_DEV} - - ORG_FILE=examples/organizations__pilot_pangea.csv + - OIDC_OIRGS=examples/organizations__pilot_pangea.csv + - OIDC_REDIRECT=true ports: - 9032:9002 volumes: