From 0b507962fa28c2b3a744f5c44352fe72c5c169fb Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 17:41:47 -0500 Subject: [PATCH 1/2] 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 15ccb5642bdd770cc5d549087e98a42ed2360b9a Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 13 Jan 2021 09:59:21 -0500 Subject: [PATCH 2/2] 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