Merge branch 'acs-frontend-persist' into acs-mysql-frontend-persist

docker-compose.yml

@@ -9,10 +9,10 @@ services:
         mem_limit: 1700m
         environment:
             JAVA_OPTS: "
-                -Ddb.driver=org.postgresql.Driver
+                -Ddb.driver=com.mysql.jdbc.Driver
                 -Ddb.username=alfresco
                 -Ddb.password=alfresco
-                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
                 -Dindex.subsystem.name=solr6
                 -Dsolr.host=search
                 -Dsolr.port=8983
@@ -42,8 +42,11 @@ services:
                 -Djodconverter.enabled=false
                 "
         depends_on:
-            - postgres-acs
+            - mysql-acs
             - activemq
+        volumes:
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
+            - /usr/share/java/mysql.jar:/usr/local/tomcat/lib/mysql.jar:ro
     
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:2.3.6
@@ -64,14 +67,16 @@ services:
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
                 "
     
-    postgres-acs:
-        image: postgres:11.7
+    mysql-acs:
+        image: mysql:5.7
         mem_limit: 512m
         environment:
-            - POSTGRES_PASSWORD=alfresco
-            - POSTGRES_USER=alfresco
-            - POSTGRES_DB=alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
+            - MYSQL_RANDOM_ROOT_PASSWORD=true
+            - MYSQL_PASSWORD=alfresco
+            - MYSQL_USER=alfresco
+            - MYSQL_DATABASE=alfresco
+        volumes:
+            - acsdb-volume:/var/lib/mysql:rw
     
     search:
         image: alfresco/alfresco-search-services:2.0.1
@@ -83,10 +88,14 @@ services:
             - SOLR_SOLR_PORT=8983
             - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
             - ALFRESCO_SECURE_COMMS=none
+        volumes:
+            - solrindex-volume:/opt/alfresco-search-services/data:rw
 
     activemq:
         image: alfresco/alfresco-activemq:5.15.8
         mem_limit: 256m
+        volumes:
+            - activemq-volume:/opt/activemq/data:rw
 
     proxy:
         build: ./nginx-ingress
@@ -96,3 +105,14 @@ services:
         depends_on:
             - platform
             - share
+
+volumes:
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    activemq-volume:
+        driver: local
+    solrindex-volume:
+        driver: local
+