Merge branch 'acs-base' into acs-mysql-base

docker-compose.yml

@@ -17,19 +17,19 @@ services:
                 -Dmetadata-keystore.metadata.password=oKIWzVdEdA
                 -Dmetadata-keystore.metadata.algorithm=DESede"
             JAVA_OPTS: "
-                -Ddb.driver=org.postgresql.Driver
+                -Ddb.driver=com.mysql.jdbc.Driver
-                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
                 "
         depends_on:
-            - postgres-acs
+            - mysql-acs
             - activemq
     
-    postgres-acs:
+    mysql-acs:
-        image: postgres:${POSTGRES_TAG}
+        image: mysql:latest
 
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}