Merge branch 'acs-base' into acs-persist

docker-compose.yml

@@ -15,48 +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=com.mysql.jdbc.Driver
-                -Ddb.username=alfresco
-                -Ddb.password=alfresco
-                -Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
-                -Dindex.subsystem.name=noindex
+                -Ddb.driver=org.postgresql.Driver
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
                 -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:
-            - mysql-acs
+            - postgres-acs
             - activemq
+        volumes:
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
-    mysql-acs:
-        image: mysql:5.7
-        environment:
-            - MYSQL_RANDOM_ROOT_PASSWORD=true
-            - MYSQL_PASSWORD=alfresco
-            - MYSQL_USER=alfresco
-            - MYSQL_DATABASE=alfresco
+    postgres-acs:
+        image: postgres:${POSTGRES_TAG}
+        volumes:
+            - acsdb-volume:/var/lib/postgresql/data:rw
 
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
-        environment:
-            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
-            ACTIVEMQ_ADMIN_LOGIN: alfresco
-            ACTIVEMQ_ADMIN_PASSWORD: alfresco
+        volumes:
+            - activemq-volume:/opt/activemq/data:rw
 
     proxy:
         build: ./nginx-ingress
@@ -65,3 +47,11 @@ services:
             - 8080:8080
         depends_on:
             - platform
+
+volumes:
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    activemq-volume:
+        driver: local