Merge branch 'acs-backend' into acs-frontend

docker-compose.yml

@@ -19,10 +19,10 @@ services:
                 "
             JAVA_OPTS: "
                 -Xms512m -Xmx1g
-                -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.secureComms=secret
@@ -43,7 +43,8 @@ services:
                 -Dtika.url=http://transform-core-aio:8090/
                 -Dtransform.misc.url=http://transform-core-aio:8090/
                 -Dcsrf.filter.enabled=false
-                -Dcors.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=true
                 -Dsystem.content.eagerOrphanCleanup=true
@@ -51,11 +52,8 @@ 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:${ATE_AIO_TAG}
@@ -75,15 +73,13 @@ services:
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
                 "
     
-    mysql-acs:
+    postgres-acs:
-        image: mysql:5.7
+        image: postgres:${POSTGRES_TAG}
         environment:
-            - MYSQL_RANDOM_ROOT_PASSWORD=true
+            POSTGRES_PASSWORD: alfresco
-            - MYSQL_PASSWORD=alfresco
+            POSTGRES_USER: alfresco
-            - MYSQL_USER=alfresco
+            POSTGRES_DB: alfresco
-            - MYSQL_DATABASE=alfresco
+        command: postgres -c max_connections=300 -c log_min_messages=LOG
-        volumes:
-            - acsdb-volume:/var/lib/mysql:rw
     
     search:
         image: alfresco/alfresco-search-services:${ASIE_TAG}
@@ -97,8 +93,6 @@ services:
                 "
         healthcheck:
             test: "curl -fsS http://localhost:8983/solr"
-        volumes:
-            - solrindex-volume:/opt/alfresco-search-services/data:rw
 
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
@@ -106,8 +100,6 @@ services:
             ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
             ACTIVEMQ_ADMIN_LOGIN: alfresco
             ACTIVEMQ_ADMIN_PASSWORD: alfresco
-        volumes:
-            - activemq-volume:/opt/activemq/data:rw
 
     proxy:
         build: ./nginx-ingress
@@ -117,14 +109,3 @@ services:
         depends_on:
             - platform
             - share
-
-volumes:
-    acsbin-volume:
-        driver: local
-    acsdb-volume:
-        driver: local
-    activemq-volume:
-        driver: local
-    solrindex-volume:
-        driver: local
-