inteligr8/env-docker-alfresco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
brian 2021-01-13 20:52:42 -05:00
commit df5d011a3a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

2
docker-compose.yml
View File

@ -154,6 +154,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"
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress

2
nginx-ingress/nginx.conf
View File

@ -61,7 +61,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;