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

.env

@@ -1,6 +1,5 @@
-EXTERNAL_RESOURCE_DIR=~
-ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
-ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
+ALFRESCO_DIR=~/alfresco
+ALFRESCO_LICENSE_DIR=~/alfresco/license
 
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost

docker-compose.yml

@@ -8,19 +8,19 @@ services:
         image: alfresco/alfresco-content-repository:latest
         environment:
             JAVA_OPTS: "
-                -Ddb.driver=org.postgresql.Driver
-                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Ddb.driver=com.mysql.jdbc.Driver
+                -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:
-        image: postgres:latest
+    mysql-acs:
+        image: mysql:latest
 
     activemq:
         image: alfresco/alfresco-activemq:latest