Merge branch 'acs-frontend' into ags-frontend

docker-compose.yml

@@ -5,14 +5,14 @@ version: "2"
 
 services:
     platform:
-        image: alfresco/alfresco-content-repository-community:6.2.0-ga
+        image: alfresco/alfresco-governance-repository-community:V3.4-latest
         mem_limit: 1700m
         environment:
             JAVA_OPTS: "
-                -Ddb.driver=com.mysql.jdbc.Driver
+                -Ddb.driver=org.postgresql.Driver
                 -Ddb.username=alfresco
                 -Ddb.password=alfresco
-                -Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
                 -Dindex.subsystem.name=solr6
                 -Dsolr.host=search
                 -Dsolr.port=8983
@@ -42,17 +42,14 @@ services:
                 -Djodconverter.enabled=false
                 "
         depends_on:
-            - mysql-acs
+            - postgres-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
     
     share:
-        image: alfresco/alfresco-share:6.2.2
+        image: alfresco/alfresco-governance-share-community:V3.4-latest
         mem_limit: 512m
         environment:
             REPO_HOST: "platform"
@@ -67,16 +64,14 @@ services:
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
                 "
     
-    mysql-acs:
-        image: mysql:5.7
+    postgres-acs:
+        image: postgres:11.7
         mem_limit: 512m
         environment:
-            - MYSQL_RANDOM_ROOT_PASSWORD=true
-            - MYSQL_PASSWORD=alfresco
-            - MYSQL_USER=alfresco
-            - MYSQL_DATABASE=alfresco
-        volumes:
-            - acsdb-volume:/var/lib/mysql:rw
+            - POSTGRES_PASSWORD=alfresco
+            - POSTGRES_USER=alfresco
+            - POSTGRES_DB=alfresco
+        command: postgres -c max_connections=300 -c log_min_messages=LOG
     
     search:
         image: alfresco/alfresco-search-services:2.0.1
@@ -88,14 +83,10 @@ 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
@@ -105,14 +96,3 @@ services:
         depends_on:
             - platform
             - share
-
-volumes:
-    acsbin-volume:
-        driver: local
-    acsdb-volume:
-        driver: local
-    activemq-volume:
-        driver: local
-    solrindex-volume:
-        driver: local
-