From 5ea48c405f487d2b2d51c115239666c598077509 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 13 Jan 2021 18:14:24 -0500 Subject: [PATCH 1/2] added host-based config --- docker-compose.yml | 2 ++ nginx-ingress/nginx.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1649a13..51972c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,8 @@ services: digital-workspace: image: quay.io/alfresco/alfresco-digital-workspace:latest + environment: + APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}" proxy: build: ./nginx-ingress diff --git a/nginx-ingress/nginx.conf b/nginx-ingress/nginx.conf index 66da002..7473c9e 100644 --- a/nginx-ingress/nginx.conf +++ b/nginx-ingress/nginx.conf @@ -50,7 +50,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; From 6471292c34be02a93e82f9c6029c1d41559f2f32 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 13 Jan 2021 18:19:06 -0500 Subject: [PATCH 2/2] added share proxy to adw --- .env | 4 ++-- docker-compose.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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 50954f8..62f2fd8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -151,6 +151,7 @@ services: 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" proxy: build: ./nginx-ingress