Merge branch 'acs-adw-base' into acs-frontend-enterprise
This commit is contained in:
commit
7114bb5de1
@ -150,6 +150,7 @@ services:
|
|||||||
mem_limit: 128m
|
mem_limit: 128m
|
||||||
environment:
|
environment:
|
||||||
BASE_PATH: ./
|
BASE_PATH: ./
|
||||||
|
APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
|
||||||
|
|
||||||
proxy:
|
proxy:
|
||||||
build: ./nginx-ingress
|
build: ./nginx-ingress
|
||||||
|
@ -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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user