From 93a6f5a25ea66d663463ab79a3d590148016256c Mon Sep 17 00:00:00 2001 From: pedro Date: Mon, 18 Mar 2024 21:10:05 +0100 Subject: [PATCH] put DOMAIN as first env var --- docker-compose__instance-autotest-pair.yml | 4 ++-- docker-compose__instance-autotest.yml | 2 +- docker-compose__instance-localhost-pair.yml | 8 ++++---- docker-compose__instance-nightly-pair.yml | 4 ++-- docker-compose__instance-nightly.yml | 2 +- docker-compose__pilot-xo9b.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker-compose__instance-autotest-pair.yml b/docker-compose__instance-autotest-pair.yml index 88b1375..5f7f25b 100644 --- a/docker-compose__instance-autotest-pair.yml +++ b/docker-compose__instance-autotest-pair.yml @@ -5,6 +5,7 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: + - DOMAIN=idhub1-autotest.demo.pangea.org - DEBUG=true - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} @@ -15,7 +16,6 @@ services: - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} - PORT=${IDHUB_PORT:-9001} - - DOMAIN=${DOMAIN:-idhub1-autotest.demo.pangea.org} - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} @@ -36,6 +36,7 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: + - DOMAIN=idhub2-autotest.demo.pangea.org - DEBUG=true - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} @@ -46,7 +47,6 @@ services: - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} - PORT=${IDHUB_PORT:-9001} - - DOMAIN=${DOMAIN:-idhub2-autotest.demo.pangea.org} - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} diff --git a/docker-compose__instance-autotest.yml b/docker-compose__instance-autotest.yml index 1e0a303..d7bbd52 100644 --- a/docker-compose__instance-autotest.yml +++ b/docker-compose__instance-autotest.yml @@ -5,6 +5,7 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: + - DOMAIN=${DOMAIN:-idhub-autotest.demo.pangea.org} - DEBUG=true - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} @@ -15,7 +16,6 @@ services: - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} - PORT=${IDHUB_PORT:-9001} - - DOMAIN=${DOMAIN:-idhub-autotest.demo.pangea.org} - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} diff --git a/docker-compose__instance-localhost-pair.yml b/docker-compose__instance-localhost-pair.yml index 7529dd9..dd40ad2 100644 --- a/docker-compose__instance-localhost-pair.yml +++ b/docker-compose__instance-localhost-pair.yml @@ -5,6 +5,7 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: + - DOMAIN=${DOMAIN1:-localhost} - DEBUG=true - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} @@ -20,7 +21,6 @@ services: # $ docker run ghcr.io/spruceid/didkit-cli:latest did-resolve did:web:localhost:test # Error sending HTTP request : error sending request for url (http://localhost/.well-known/did.json): error trying to connect: tcp connect error: Address not available (os error 99) # version: 2023-04-24 10:21:58 ghcr.io/spruceid/didkit-cli@sha256:0e559663f962e2ced2fb4034e415f6b5dbdec57e85f69b546e7699ac6ba35219 - - DOMAIN=${DOMAIN1:-localhost} - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} @@ -30,7 +30,7 @@ services: - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND} - SUPPORTED_CREDENTIALS=['CourseCredential', 'EOperatorClaim', 'FederationMembership', 'FinancialVulnerabilityCredential', 'MembershipCard'] - SYNC_ORG_DEV=${IDHUB_SYNC_ORG_DEV} - - OIDC_ORGS=examples/organizations__instance_localhost-pair.csv + - OIDC_ORGS=examples/organizations__instance_localhost.csv - OIDC_REDIRECT=true #- OIDC_REDIRECT=false - ALLOW_CODE_URI=http://localhost/oidc4vp/allow_code @@ -49,6 +49,7 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: + - DOMAIN=${DOMAIN2:-idhub2} - DEBUG=true - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} @@ -59,7 +60,6 @@ services: - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} - PORT=${IDHUB_PORT:-9001} - - DOMAIN=${DOMAIN2:-idhub2} - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} @@ -70,7 +70,7 @@ services: # only the one we support for OIDC flow, if we add more, it reaches a UX bug - SUPPORTED_CREDENTIALS=['FinancialVulnerabilityCredential'] - SYNC_ORG_DEV=${IDHUB_SYNC_ORG_DEV} - - OIDC_ORGS=examples/organizations__instance_localhost-pair.csv + - OIDC_ORGS=examples/organizations__instance_localhost.csv - OIDC_REDIRECT=true #- OIDC_REDIRECT=false - ALLOW_CODE_URI=http://idhub2/oidc4vp/allow_code diff --git a/docker-compose__instance-nightly-pair.yml b/docker-compose__instance-nightly-pair.yml index 602bd5c..883473d 100644 --- a/docker-compose__instance-nightly-pair.yml +++ b/docker-compose__instance-nightly-pair.yml @@ -5,6 +5,7 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: + - DOMAIN=idhub1-nightly.demo.pangea.org - DEBUG=true - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} @@ -15,7 +16,6 @@ services: - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} - PORT=${IDHUB_PORT:-9001} - - DOMAIN=${DOMAIN:-idhub1-nightly.demo.pangea.org} - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} @@ -36,6 +36,7 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: + - DOMAIN=DOMAIN:-idhub2-nightly.demo.pangea.org - DEBUG=true - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} @@ -46,7 +47,6 @@ services: - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} - PORT=${IDHUB_PORT:-9001} - - DOMAIN=${DOMAIN:-idhub2-nightly.demo.pangea.org} - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} diff --git a/docker-compose__instance-nightly.yml b/docker-compose__instance-nightly.yml index 2b49271..d3e8c40 100644 --- a/docker-compose__instance-nightly.yml +++ b/docker-compose__instance-nightly.yml @@ -5,6 +5,7 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: + - DOMAIN=idhub-nightly.demo.pangea.org - DEBUG=true - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} @@ -15,7 +16,6 @@ services: - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} - PORT=${IDHUB_PORT:-9001} - - DOMAIN=${DOMAIN:-idhub-nightly.demo.pangea.org} - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} diff --git a/docker-compose__pilot-xo9b.yml b/docker-compose__pilot-xo9b.yml index db92591..7e04ca5 100644 --- a/docker-compose__pilot-xo9b.yml +++ b/docker-compose__pilot-xo9b.yml @@ -5,13 +5,13 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: + - DOMAIN=idhub1-xo9b.demo.pangea.org - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} - SECRET_KEY=${IDHUB_SECRET_KEY:-publicsecretisnotsecureVtmKBfxpVV47PpBCF2Nzz2H6qnbd} - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} - PORT=${IDHUB_PORT:-9001} - - DOMAIN=idhub1-xo9b.demo.pangea.org - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} @@ -33,9 +33,9 @@ services: init: true image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest environment: + - DOMAIN=idhub2-xo9b.demo.pangea.org - INITIAL_ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL} - INITIAL_ADMIN_PASSWORD=${IDHUB_PILOT_TEST__ADMIN_PASSWORD} - - DOMAIN=idhub2-xo9b.demo.pangea.org - SECRET_KEY=${IDHUB_SECRET_KEY:-publicsecretisnotsecureVtmKBfxpVV47PpBCF2Nzz2H6qnbd} - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/}