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

@@ -15,64 +15,30 @@ services:
                 -Dmetadata-keystore.password=mp6yc0UD9e
                 -Dmetadata-keystore.aliases=metadata
                 -Dmetadata-keystore.metadata.password=oKIWzVdEdA
-                -Dmetadata-keystore.metadata.algorithm=DESede
+                -Dmetadata-keystore.metadata.algorithm=DESede"
-                "
             JAVA_OPTS: "
-                -Xms512m -Xmx1g
                 -Ddb.driver=org.postgresql.Driver
-                -Ddb.username=alfresco
-                -Ddb.password=alfresco
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dindex.subsystem.name=solr6
-                -Dsolr.host=search
-                -Dsolr.secureComms=secret
-                -Dsolr.sharedSecret=alfresco-secret
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
-                -Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-                -Ddeployment.method=DOCKER_COMPOSE
-                -Dcsrf.filter.enabled=false
-                -Dcors.enabled=true
-                -Dcors.allowed.origins=http://localhost:4200,http://localhost:8080,${PROXY_PROTOCOL}://${PROXY_HOST}
-                -Dtransform.service.enabled=false
-                -Dlocal.transform.service.enabled=false
-                -Dsystem.content.eagerOrphanCleanup=true
-                -Dsystem.content.orphanProtectDays=0
-                -Djodconverter.enabled=false
                 "
         depends_on:
             - postgres-acs
             - activemq
+        volumes:
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
     postgres-acs:
         image: postgres:${POSTGRES_TAG}
-        environment:
+        volumes:
-            POSTGRES_PASSWORD: alfresco
+            - acsdb-volume:/var/lib/postgresql/data:rw
-            POSTGRES_USER: alfresco
-            POSTGRES_DB: alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
-    
-    search:
-        image: alfresco/alfresco-search-services:${ASIE_TAG}
-        environment:
-            SOLR_ALFRESCO_HOST: platform
-            SOLR_SOLR_HOST: search
-            SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
-            ALFRESCO_SECURE_COMMS: secret
-            JAVA_TOOL_OPTIONS: "
-                -Dalfresco.secureComms.secret=alfresco-secret
-                "
-        healthcheck:
-            test: "curl -fsS http://localhost:8983/solr"
 
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
-        environment:
+        volumes:
-            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
+            - activemq-volume:/opt/activemq/data:rw
-            ACTIVEMQ_ADMIN_LOGIN: alfresco
-            ACTIVEMQ_ADMIN_PASSWORD: alfresco
 
     proxy:
         build: ./nginx-ingress
@@ -81,3 +47,11 @@ services:
             - 8080:8080
         depends_on:
             - platform
+
+volumes:
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    activemq-volume:
+        driver: local