diff --git a/app-config/caimira-webservice/app.sh b/app-config/caimira-webservice/app.sh index 0d0452c8..40380a7e 100755 --- a/app-config/caimira-webservice/app.sh +++ b/app-config/caimira-webservice/app.sh @@ -6,13 +6,16 @@ if [[ "$APP_NAME" == "caimira-webservice" ]]; then args+=("--no-debug") fi - if [ ! -z "$CAIMIRA_THEME" ]; then - args+=("--theme=${CAIMIRA_THEME}") + if [ ! -z "$APPLICATION_ROOT" ]; then + args+=("--app_root=${APPLICATION_ROOT}") fi if [ ! -z "$CAIMIRA_CALCULATOR_PREFIX" ]; then args+=("--prefix=${CAIMIRA_CALCULATOR_PREFIX}") fi + if [ ! -z "$CAIMIRA_THEME" ]; then + args+=("--theme=${CAIMIRA_THEME}") + fi export "ARVE_API_KEY"="$ARVE_API_KEY" export "ARVE_CLIENT_ID"="$ARVE_CLIENT_ID" diff --git a/app-config/docker-compose.yml b/app-config/docker-compose.yml index cb9d3958..b2046c21 100644 --- a/app-config/docker-compose.yml +++ b/app-config/docker-compose.yml @@ -11,6 +11,7 @@ services: environment: - COOKIE_SECRET - APP_NAME=caimira-webservice + - APPLICATION_ROOT=/ - CAIMIRA_CALCULATOR_PREFIX=/calculator-cern - CAIMIRA_THEME=caimira/apps/templates/cern user: ${CURRENT_UID} @@ -20,6 +21,7 @@ services: environment: - COOKIE_SECRET - APP_NAME=caimira-webservice + - APPLICATION_ROOT=/ - CAIMIRA_CALCULATOR_PREFIX=/calculator-open user: ${CURRENT_UID} diff --git a/app-config/openshift/deploymentconfig.yaml b/app-config/openshift/deploymentconfig.yaml index 5e23cede..456a2d4b 100644 --- a/app-config/openshift/deploymentconfig.yaml +++ b/app-config/openshift/deploymentconfig.yaml @@ -205,6 +205,8 @@ value: '3' - name: APP_NAME value: caimira-webservice + - name: APPLICATION_ROOT + value: / - name: CAIMIRA_CALCULATOR_PREFIX value: /calculator-cern - name: CAIMIRA_THEME @@ -297,6 +299,8 @@ env: - name: APP_NAME value: caimira-webservice + - name: APPLICATION_ROOT + value: / - name: CAIMIRA_CALCULATOR_PREFIX value: /calculator-open image: '${PROJECT_NAME}/caimira-webservice'