Merge branch 'acs-base.base' into acs-ats-base.acs-base

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
@@ -34,6 +39,8 @@ services:
 
     proxy:
         image: alfresco/alfresco-acs-nginx:latest
+        environment:
+            REPO_URL: "http://platform:8080"
         depends_on:
             - platform
         ports: