diff --git a/.env b/.env index af14c9d..f67bfc6 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -EXTERNAL_RESOURCE_DIR=~ +EXTERNAL_RESOURCE_DIR=/home/brian ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco -ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license +ALFRESCO_LICENSE_DIR=~/alfresco/license PROXY_PROTOCOL=http PROXY_HOST=localhost diff --git a/docker-compose.yml b/docker-compose.yml index 2aab9ff..df4c838 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -150,6 +150,8 @@ services: mem_limit: 128m environment: BASE_PATH: ./ + APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}" + APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s" identity: image: alfresco/alfresco-identity-service:1.3 diff --git a/nginx-ingress/nginx.conf b/nginx-ingress/nginx.conf index 4f7ab44..2b716cf 100644 --- a/nginx-ingress/nginx.conf +++ b/nginx-ingress/nginx.conf @@ -58,7 +58,7 @@ http { } location /workspace/ { - proxy_pass http://digital-workspace:8080; + proxy_pass http://digital-workspace:8080/; # If using external proxy / load balancer (for initial redirect if no trailing slash) absolute_redirect off;