Merge branch 'acs-search-base' into acs-search-persist

.env

@@ -1,6 +1,5 @@
-EXTERNAL_RESOURCE_DIR=~
-ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
-ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
+ALFRESCO_DIR=~/alfresco
+ALFRESCO_LICENSE_DIR=~/alfresco/license
 
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost

docker-compose.yml

@@ -18,18 +18,26 @@ services:
         depends_on:
             - postgres-acs
             - activemq
+        volumes:
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
     postgres-acs:
         image: postgres:latest
+        volumes:
+            - acsdb-volume:/var/lib/postgresql/data:rw
     
     search:
         image: alfresco/alfresco-search-services:latest
         environment:
             - SOLR_ALFRESCO_HOST=platform
             - SOLR_SOLR_HOST=search
+        volumes:
+            - solrindex-volume:/opt/alfresco-search-services/data:rw
 
     activemq:
         image: alfresco/alfresco-activemq:latest
+        volumes:
+            - activemq-volume:/opt/activemq/data:rw
 
     proxy:
         build: ./nginx-ingress
@@ -38,3 +46,13 @@ services:
             - 8080:8080
         depends_on:
             - platform
+
+volumes:
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    activemq-volume:
+        driver: local
+    solrindex-volume:
+        driver: local