From c1323a81713f1e29feceddaaf126da00f33c32db Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:38:34 -0500 Subject: [PATCH 01/13] added ATS minimum unconfigured services --- docker-compose.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index dc160fe..5727f8a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,15 @@ services: alfresco: image: alfresco/alfresco-content-repository:latest + transform-router: + image: quay.io/alfresco/alfresco-transform-router:latest + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:latest + + shared-file-store: + image: alfresco/alfresco-shared-file-store:latest + postgres-acs: image: postgres:latest @@ -19,3 +28,9 @@ services: - alfresco ports: - 8080:8080 + +volumes: + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs From 89626fcd1d1ff46acc3ef1bc5c6130a0ff70f45d Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:42:22 -0500 Subject: [PATCH 02/13] added minimum unconfigured ADW service --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index dc160fe..8e1c7d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,9 +13,13 @@ services: activemq: image: alfresco/alfresco-activemq:latest + digital-workspace: + image: quay.io/alfresco/alfresco-digital-workspace:latest + proxy: image: alfresco/alfresco-acs-nginx:latest depends_on: - alfresco + - digital-workspace ports: - 8080:8080 From 79ef1f5868e01c462406ff190064939761dfa1a9 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 12:37:10 -0500 Subject: [PATCH 03/13] added depends_on for ATS --- docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ae8eace..7a4d3a2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,12 +9,19 @@ services: depends_on: - postgres-acs - activemq + - shared-file-store transform-router: image: quay.io/alfresco/alfresco-transform-router:latest + depends_on: + - activemq + - shared-file-store transform-core-aio: image: alfresco/alfresco-transform-core-aio:latest + depends_on: + - activemq + - shared-file-store shared-file-store: image: alfresco/alfresco-shared-file-store:latest From 487a677f6fe8c2e565ae7f53fa3c30053e883bde Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 12:48:48 -0500 Subject: [PATCH 04/13] added service referencing variables --- docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 083b8a7..6a0b4b0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,12 +18,19 @@ services: transform-router: image: quay.io/alfresco/alfresco-transform-router:latest + environment: + ACTIVEMQ_URL: "nio://activemq:61616" + CORE_AIO_URL : "http://transform-core-aio:8090" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" depends_on: - activemq - shared-file-store transform-core-aio: image: alfresco/alfresco-transform-core-aio:latest + environment: + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" depends_on: - activemq - shared-file-store From e5824d17e17833d97db55c9617bbdb6e910d6088 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 16:28:54 -0500 Subject: [PATCH 05/13] added adw 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 a95498f..c945dc3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: proxy: build: ./nginx-ingress - image: local/nginx-ingress:acs + image: local/nginx-ingress:acs-adw ports: - 8080:8080 depends_on: diff --git a/nginx-ingress/entrypoint.sh b/nginx-ingress/entrypoint.sh index 5adaad5..a38acac 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%"$REPO_URL"%g /etc/nginx/nginx.conf fi +if [[ $ADW_URL ]]; then + sed -i s%http:\/\/digital-workspace:8080%"$ADW_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..0fd8d86 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 /workspace/ { + proxy_pass http://digital-workspace:8080; + + # If using external proxy / load balancer (for initial redirect if no trailing slash) + absolute_redirect off; + } } } From f73fdbb5ea26037466f3bad12c1852317701a509 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 17:16:01 -0500 Subject: [PATCH 06/13] added volume to base shared file store config --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 7c218a5..acc03c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,6 +37,8 @@ services: shared-file-store: image: alfresco/alfresco-shared-file-store:latest + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs postgres-acs: image: postgres:latest From 0b507962fa28c2b3a744f5c44352fe72c5c169fb Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 17:41:47 -0500 Subject: [PATCH 07/13] added sync service config --- docker-compose.yml | 16 +++++++++++++++- nginx-ingress/entrypoint.sh | 4 ++++ nginx-ingress/nginx.conf | 4 ++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index fbc506d..fc02630 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\" + -Ddsync.service.uris=http://localhost:8080/sync " depends_on: - postgres-acs @@ -21,10 +22,23 @@ services: activemq: image: alfresco/alfresco-activemq:latest + sync: + image: quay.io/alfresco/service-sync:latest + environment: + JAVA_OPTS : " + -Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco + -Dmessaging.broker.host=activemq + -Drepo.hostname=platform + " + depends_on: + - postgres-acs + - activemq + proxy: build: ./nginx-ingress - image: local/nginx-ingress:acs + image: local/nginx-ingress:acs-sync ports: - 8080:8080 depends_on: - platform + - sync diff --git a/nginx-ingress/entrypoint.sh b/nginx-ingress/entrypoint.sh index 3dc2e8e..4cc1b7e 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_SYNC_URL ]]; then + sed -i s%http:\/\/sync:9090%"$ACS_SYNC_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..57fb543 100644 --- a/nginx-ingress/nginx.conf +++ b/nginx-ingress/nginx.conf @@ -47,5 +47,9 @@ http { # If using external proxy / load balancer (for initial redirect if no trailing slash) absolute_redirect off; } + + location /sync/ { + proxy_pass http://sync:9090/alfresco/; + } } } From ce9b143fb58e84c3a73fc321f0da7061ece648d8 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Mon, 21 Dec 2020 11:50:38 -0500 Subject: [PATCH 08/13] added ATS-only base config --- docker-compose.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index f70207f..532c9ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,3 +3,36 @@ # Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose version: "2" +services: + transform-router: + image: quay.io/alfresco/alfresco-transform-router:latest + environment: + ACTIVEMQ_URL: "nio://activemq:61616" + CORE_AIO_URL : "http://transform-core-aio:8090" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + depends_on: + - activemq + - shared-file-store + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:latest + environment: + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + depends_on: + - activemq + - shared-file-store + + shared-file-store: + image: alfresco/alfresco-shared-file-store:latest + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs + + activemq: + image: alfresco/alfresco-activemq:latest + +volumes: + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs From cafee75cdca900817ea149c122bc7cd4f51b1f04 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 6 Jan 2021 15:21:05 -0500 Subject: [PATCH 09/13] set platform to v6.2.2.3 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 31f70e7..38b3fa4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ version: "2" services: platform: - image: alfresco/alfresco-content-repository-community:6.2.0-ga + image: alfresco/alfresco-content-repository:6.2.2.3 mem_limit: 1700m environment: JAVA_OPTS: " From 68dc0713428ae8b4e7a79bd6c021f516bae54b49 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 6 Jan 2021 15:36:32 -0500 Subject: [PATCH 10/13] configured ACS for ATS --- docker-compose.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 81ac2c7..76d895d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,8 +23,16 @@ services: -Dcsrf.filter.enabled=false -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - -Dtransform.service.enabled=false + -Dtransform.service.enabled=true -Dlocal.transform.service.enabled=false + + -Dtransform.service.url=http://transform-router:8095 + -Dsfs.url=http://shared-file-store:8099 + -Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090 + -Djodconverter.url=http://transform-engine-aio:8090 + -Dimg.url=http://transform-engine-aio:8090 + -Dtika.url=http://transform-engine-aio:8090 + -Dtransform.misc.url=http://transform-engine-aio:8090 -Dsystem.content.eagerOrphanCleanup=true -Dsystem.content.orphanProtectDays=0 @@ -33,9 +41,10 @@ services: depends_on: - postgres-acs - activemq + - shared-file-store transform-router: - image: quay.io/alfresco/alfresco-transform-router:latest + image: quay.io/alfresco/alfresco-transform-router:1.3.1 environment: ACTIVEMQ_URL: "nio://activemq:61616" CORE_AIO_URL : "http://transform-core-aio:8090" @@ -45,7 +54,7 @@ services: - shared-file-store transform-core-aio: - image: alfresco/alfresco-transform-core-aio:latest + image: alfresco/alfresco-transform-core-aio:2.3.6 environment: ACTIVEMQ_URL: "nio://activemq:61616" FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" @@ -54,7 +63,7 @@ services: - shared-file-store shared-file-store: - image: alfresco/alfresco-shared-file-store:latest + image: alfresco/alfresco-shared-file-store:0.10.0 volumes: - shared-file-store-volume:/tmp/Alfresco/sfs From dc9fb0abfaad469bd0f5f35a32c02898e598a6a1 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 6 Jan 2021 15:39:29 -0500 Subject: [PATCH 11/13] added license dir --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 38b3fa4..ebbadd3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,6 +33,8 @@ services: depends_on: - postgres-acs - activemq + volumes: + - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro" postgres-acs: image: postgres:11.7 From 15ccb5642bdd770cc5d549087e98a42ed2360b9a Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 13 Jan 2021 09:59:21 -0500 Subject: [PATCH 12/13] using proxy values for sync url --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8f3df2d..8cb3ecb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: -Dalfresco.port=${PROXY_PORT} -Dalfresco.protocol=${PROXY_PROTOCOL} -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" - -Ddsync.service.uris=http://localhost:8080/sync + -Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync " depends_on: - postgres-acs From 41858ebddb348d4513ebffdf5cdb5bbdb0a9b36c Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 13 Jan 2021 11:47:27 -0500 Subject: [PATCH 13/13] added ADW version and config --- docker-compose.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 98fee3c..8400e3b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -139,7 +139,10 @@ services: - activemq digital-workspace: - image: quay.io/alfresco/alfresco-digital-workspace:latest + image: quay.io/alfresco/alfresco-digital-workspace:2.0.0-adw + mem_limit: 128m + environment: + BASE_PATH: ./ proxy: build: ./nginx-ingress