From bfa65c999ec00e6b4c65427b3237996e859cd250 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:40:20 -0500 Subject: [PATCH 01/12] 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 02/12] 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 3fea801d26efde51628b2d536bcfc5e8fc8ebe22 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 00:01:13 -0500 Subject: [PATCH 03/12] added minimum local transform service --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 0214f19..40cdced 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,9 @@ services: - postgres-acs - activemq + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:latest + postgres-acs: image: postgres:latest From 0bb3b7bb28c5b1aa03f33c59a64c350b003bee15 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 13:07:55 -0500 Subject: [PATCH 04/12] added service name reference to platform --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 4fb79a4..b904a49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,7 @@ services: JAVA_OPTS: " -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ " depends_on: - postgres-acs From 055119eeb5e5e8d005eeccf2cfab672a0a5a58bc Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 14:24:15 -0500 Subject: [PATCH 05/12] 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 06/12] 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; + } } } From ddb535ab14a9688ab0216545a8685842257f2f79 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 16:40:02 -0500 Subject: [PATCH 07/12] added legacy transform URLs --- docker-compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ed8dba9..97b2b3f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,11 @@ services: -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ + -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/ + -Djodconverter.url=http://transform-core-aio:8090/ + -Dimg.url=http://transform-core-aio:8090/ + -Dtika.url=http://transform-core-aio:8090/ + -Dtransform.misc.url=http://transform-core-aio:8090/ " depends_on: - postgres-acs From 6a6dbdc79846ec24260f4209fbe2d8c23b823151 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 16:48:13 -0500 Subject: [PATCH 08/12] set core-aio version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index fefa67f..d45169b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,7 +38,7 @@ services: - activemq transform-core-aio: - image: alfresco/alfresco-transform-core-aio:latest + image: alfresco/alfresco-transform-core-aio:2.3.6 postgres-acs: image: postgres:11.7 From 68fcb3cbef83194b1e5b712c0536f5f45ff45629 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 26 Dec 2020 11:20:42 -0500 Subject: [PATCH 09/12] added proxy config to share --- docker-compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index b0e705b..478ee1c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,11 @@ services: image: alfresco/alfresco-share:latest environment: REPO_HOST: "platform" + JAVA_OPTS: " + -Dalfresco.host=${PROXY_PLATFORM_HOST} + -Dalfresco.port=${PROXY_PLATFORM_PORT} + -Dalfresco.protocol=${PROXY_PLATFORM_PROTOCOL} + " postgres-acs: image: postgres:latest From 2367651a7ee1c8d0eca7b449decfb40af5a91c54 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 26 Dec 2020 13:52:17 -0500 Subject: [PATCH 10/12] added share context removed from acs-base --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index a7a9dbb..478ee1c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,9 @@ services: JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco + -Dshare.host=${PROXY_SHARE_HOST} + -Dshare.port=${PROXY_SHARE_PORT} + -Dshare.protocol=${PROXY_SHARE_PROTOCOL} -Dalfresco.host=${PROXY_PLATFORM_HOST} -Dalfresco.port=${PROXY_PLATFORM_PORT} -Dalfresco.protocol=${PROXY_PLATFORM_PROTOCOL} From 89ffe20aeef147e8d637d575cbb3cb1ccec72e30 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 26 Dec 2020 15:10:13 -0500 Subject: [PATCH 11/12] added CSRF --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 9a221f7..2668f47 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,8 @@ services: image: alfresco/alfresco-share:latest environment: REPO_HOST: "platform" + CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*" + CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?" JAVA_OPTS: " -Dalfresco.host=${PROXY_HOST} -Dalfresco.port=${PROXY_PORT} From 4afdf95b446d91291d61f44d5564c46a72be7ac1 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 6 Jan 2021 10:45:23 -0500 Subject: [PATCH 12/12] added share context to share config --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 2668f47..c1d955c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,6 +29,9 @@ services: CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*" CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?" JAVA_OPTS: " + -Dshare.host=${PROXY_HOST} + -Dshare.port=${PROXY_PORT} + -Dshare.protocol=${PROXY_PROTOCOL} -Dalfresco.host=${PROXY_HOST} -Dalfresco.port=${PROXY_PORT} -Dalfresco.protocol=${PROXY_PROTOCOL}