From 5cfee3d18f9edd6018e0ba04af716e7e7669dc96 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 12:31:55 -0500 Subject: [PATCH 1/3] updated service names --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0214f19..ba78567 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ version: "2" services: - alfresco: + platform: image: alfresco/alfresco-content-repository:latest depends_on: - postgres-acs @@ -19,6 +19,6 @@ services: proxy: image: alfresco/alfresco-acs-nginx:latest depends_on: - - alfresco + - platform ports: - 8080:8080 From 79a1644530ac171b2a85e88c82468f8eb5e417c8 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 12:46:24 -0500 Subject: [PATCH 2/3] more corrections to service names and addressing additions --- docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ba78567..5bdc666 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,11 @@ version: "2" services: platform: image: alfresco/alfresco-content-repository:latest + environment: + JAVA_OPTS: " + -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco + -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + " depends_on: - postgres-acs - activemq @@ -18,6 +23,8 @@ services: proxy: image: alfresco/alfresco-acs-nginx:latest + environment: + REPO_URL: "http://platform:8080" depends_on: - platform ports: From 90e935a49ee34c3acc9b920103001dd46dbfa36c Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 13:22:05 -0500 Subject: [PATCH 3/3] minor fixes --- docker-compose.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fa6a9a0..64866bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,12 +19,12 @@ services: -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE + -Dcsrf.filter.enabled=false + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 -Dtransform.service.enabled=false -Dlocal.transform.service.enabled=false - -Dcsrf.filter.enabled=false - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 -Dsystem.content.eagerOrphanCleanup=true -Dsystem.content.orphanProtectDays=0 " @@ -33,7 +33,7 @@ services: - activemq postgres-acs: - image: postgres:11.4 + image: postgres:11.7 mem_limit: 512m environment: - POSTGRES_PASSWORD=alfresco @@ -43,12 +43,7 @@ services: activemq: image: alfresco/alfresco-activemq:5.15.8 - mem_limit: 1g - ports: - - 8161:8161 # HTTP - - 5672:5672 # AMQP - - 61616:61616 # OpenWire - - 61613:61613 # STOMP + mem_limit: 256m proxy: image: alfresco/alfresco-acs-nginx:3.0.2