Merge branch 'acs-base' into acs-persist

.env

@@ -8,4 +8,3 @@ PROXY_PORT=8080
 ACS_TAG=7.4.1.1
 AAMQ_TAG=latest
 POSTGRES_TAG=13
-ASIE_TAG=2.0.8.2

docker-compose.yml

@@ -18,9 +18,7 @@ services:
                 -Dmetadata-keystore.metadata.algorithm=DESede"
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
-                -Dsolr.host=search
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dsolr.secureComms=secret
-                -Dsolr.sharedSecret=alfresco-secret
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -29,22 +27,18 @@ services:
         depends_on:
             - postgres-acs
             - activemq
+        volumes:
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
     postgres-acs:
         image: postgres:${POSTGRES_TAG}
-    
+        volumes:
-    search:
+            - acsdb-volume:/var/lib/postgresql/data:rw
-        image: alfresco/alfresco-search-services:${ASIE_TAG}
-        environment:
-            SOLR_ALFRESCO_HOST: platform
-            SOLR_SOLR_HOST: search
-            ALFRESCO_SECURE_COMMS: secret
-            JAVA_TOOL_OPTIONS: "
-                -Dalfresco.secureComms.secret=alfresco-secret
-                "
 
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
+        volumes:
+            - activemq-volume:/opt/activemq/data:rw
 
     proxy:
         build: ./nginx-ingress
@@ -53,3 +47,11 @@ services:
             - 8080:8080
         depends_on:
             - platform
+
+volumes:
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    activemq-volume:
+        driver: local