Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise

This commit is contained in:
Brian Long 2021-01-13 20:55:01 -05:00
commit af39f367b6
3 changed files with 5 additions and 3 deletions

4
.env
View File

@ -1,6 +1,6 @@
EXTERNAL_RESOURCE_DIR=~ EXTERNAL_RESOURCE_DIR=/home/brian
ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license ALFRESCO_LICENSE_DIR=~/alfresco/license
PROXY_PROTOCOL=http PROXY_PROTOCOL=http
PROXY_HOST=localhost PROXY_HOST=localhost

View File

@ -150,6 +150,8 @@ services:
mem_limit: 128m mem_limit: 128m
environment: environment:
BASE_PATH: ./ 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: identity:
image: alfresco/alfresco-identity-service:1.3 image: alfresco/alfresco-identity-service:1.3

View File

@ -58,7 +58,7 @@ http {
} }
location /workspace/ { 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) # If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off; absolute_redirect off;