From a10075e80ef3171c90603deed6119f6b216fac71 Mon Sep 17 00:00:00 2001 From: pedro Date: Tue, 23 Jan 2024 09:10:41 +0100 Subject: [PATCH] musician: make it build and run, missing IDP binds --- .env.example | 7 ++-- docker-compose__pilot-pangea.yml | 1 + docker/musician.entrypoint.sh | 69 +++++++++++++++++++++++++------- 3 files changed, 60 insertions(+), 17 deletions(-) diff --git a/.env.example b/.env.example index 1e2d381..6d66066 100644 --- a/.env.example +++ b/.env.example @@ -6,10 +6,11 @@ # MUSICIAN #### -#MUSICIAN_SECRET_KEY='uncomment-it-and-fill-this' +MUSICIAN_SECRET_KEY='changeme_v9&&N$Lt9t*5EGwm0w' # specially useful if you want to deploy in a specific domain -#MUSICIAN_API_BASE_URL='https://orchestra.example.org' -#MUSICIAN_ALLOWED_HOSTS='musician.example.org' +MUSICIAN_API_BASE_URL='https://orchestra.example.org' +MUSICIAN_ALLOWED_HOSTS='musician.example.org' +DOMAIN='musician.example.org' # DEVICEHUB #### diff --git a/docker-compose__pilot-pangea.yml b/docker-compose__pilot-pangea.yml index c579f92..5cb1056 100644 --- a/docker-compose__pilot-pangea.yml +++ b/docker-compose__pilot-pangea.yml @@ -21,6 +21,7 @@ services: - SECRET_KEY=${MUSICIAN_SECRET_KEY:-publicsecretisnotsecureVtmKBfxpVV47PpBCF2Nzz2H6qnbd} - API_BASE_URL=${MUSICIAN_API_BASE_URL:-http://nginx-orchestra-api:3000} - ALLOWED_HOSTS=${MUSICIAN_ALLOWED_HOSTS:-*} + - DOMAIN=${MUSICIAN_DOMAIN} # TODO configure volumes #volumes: # - .:/home diff --git a/docker/musician.entrypoint.sh b/docker/musician.entrypoint.sh index ab16c03..1e916b8 100755 --- a/docker/musician.entrypoint.sh +++ b/docker/musician.entrypoint.sh @@ -1,21 +1,62 @@ #!/bin/sh set -e -set -u -#set -x +# TODO fix the env so configures it to idp, then uncomment this checker +#set -u +# DEBUG +set -x -# go to the same path as the script -cd "$(dirname ${0})" +# this function is similar to the client_id part of config_oidc (devicehub) +oidc_config() { + # in DEVICEHUB_HOST we remove anything before :// + client_id_config="/shared/client_id_${SERVER_ID_HOST#*://}" + CLIENT_ID= + CLIENT_SECRET= -cat > .env < .env <