From bfa65c999ec00e6b4c65427b3237996e859cd250 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:40:20 -0500 Subject: [PATCH 1/4] added share unconfigured service --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index dc160fe..2082de0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,9 @@ services: alfresco: image: alfresco/alfresco-content-repository:latest + share: + image: alfresco/alfresco-share:latest + postgres-acs: image: postgres:latest From 00e0a17249b887b015b446a1ab66dc7d652d58d3 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:42:47 -0500 Subject: [PATCH 2/4] added share to proxy --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 2082de0..b4cea6d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,5 +20,6 @@ services: image: alfresco/alfresco-acs-nginx:latest depends_on: - alfresco + - share ports: - 8080:8080 From 055119eeb5e5e8d005eeccf2cfab672a0a5a58bc Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 14:24:15 -0500 Subject: [PATCH 3/4] added share config --- docker-compose.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5f81426..0ba37ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,8 @@ services: -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Dindex.subsystem.name=solr6 -Dsolr.host=search + -Dshare.host=localhost + -Dshare.port=8080 -Dalfresco.host=localhost -Dalfresco.port=8080 -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos @@ -34,9 +36,14 @@ services: - activemq share: - image: alfresco/alfresco-share:latest + image: alfresco/alfresco-share:6.2.2 + mem_limit: 512m environment: REPO_HOST: "platform" + JAVA_OPTS: " + -Dalfresco.host=localhost + -Dalfresco.port=8080 + " postgres-acs: image: postgres:11.7 From ff5442c869091362ea96f8bd99fe54702e901d98 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 16:32:32 -0500 Subject: [PATCH 4/4] added share to nginx --- docker-compose.yml | 2 +- nginx-ingress/entrypoint.sh | 4 ++++ nginx-ingress/nginx.conf | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9eb0a72..f9499b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: proxy: build: ./nginx-ingress - image: local/nginx-ingress:acs + image: local/nginx-ingress:acs-share ports: - 8080:8080 depends_on: diff --git a/nginx-ingress/entrypoint.sh b/nginx-ingress/entrypoint.sh index 3dc2e8e..48f44e8 100644 --- a/nginx-ingress/entrypoint.sh +++ b/nginx-ingress/entrypoint.sh @@ -4,6 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf fi +if [[ $ACS_SHARE_URL ]]; then + sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf +fi + if [[ $ACCESS_LOG ]]; then sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf fi diff --git a/nginx-ingress/nginx.conf b/nginx-ingress/nginx.conf index 0bbab22..005cadc 100644 --- a/nginx-ingress/nginx.conf +++ b/nginx-ingress/nginx.conf @@ -47,5 +47,12 @@ http { # If using external proxy / load balancer (for initial redirect if no trailing slash) absolute_redirect off; } + + location /share/ { + proxy_pass http://share:8080; + + # If using external proxy / load balancer (for initial redirect if no trailing slash) + absolute_redirect off; + } } }