Merge branch 'acs-base' into acs-persist

docker-compose.yml

@@ -9,7 +9,7 @@ services:
         environment:
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
-                -Dsolr.host=search
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -18,18 +18,18 @@ services:
         depends_on:
             - postgres-acs
             - activemq
+        volumes:
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
     postgres-acs:
         image: postgres:latest
-    
-    search:
-        image: alfresco/alfresco-search-services:latest
-        environment:
-            - SOLR_ALFRESCO_HOST=platform
-            - SOLR_SOLR_HOST=search
+        volumes:
+            - acsdb-volume:/var/lib/postgresql/data:rw
 
     activemq:
         image: alfresco/alfresco-activemq:latest
+        volumes:
+            - activemq-volume:/opt/activemq/data:rw
 
     proxy:
         build: ./nginx-ingress
@@ -38,3 +38,11 @@ services:
             - 8080:8080
         depends_on:
             - platform
+
+volumes:
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    activemq-volume:
+        driver: local