Merge branch 'acs' into acs-mysql

README.md

@@ -3,11 +3,3 @@
 
 This Git Repository intends to represent environments in Docker Compose.  All environments are effectively a derivative of other environments.  The original environment is the environment represented by the `base` branch.  All derivative environments are represented by other branches.  Those branches are named in the format `{core}.{parent}`.
 
-## Licensing
-
-This version of Alfresco requires licensing.
-
-### ACS Enterprise
-
-The enterprise version of ACS requires a license file for it to work for more than 2 days.  This means it isn't really required, but it is becomes important when you utilize any `persist` branch.  For licensing to work, you must place your license file in the following directory relative to the user home directory that runs the Docker Compose command: `alfresco/license/acs`.  There must be just one file in there that ends in `.lic`.
-

docker-compose.yml

@@ -5,7 +5,7 @@ version: "3"
 services:
 
     platform:
-        image: quay.io/alfresco/alfresco-content-repository:${ACS_TAG}
+        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
         environment:
             JAVA_TOOL_OPTIONS: "
                 -Dencryption.keystore.type=JCEKS
@@ -19,10 +19,10 @@ services:
                 "
             JAVA_OPTS: "
                 -Xms512m -Xmx1g
-                -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=noindex
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
@@ -40,18 +40,16 @@ services:
                 -Djodconverter.enabled=false
                 "
         depends_on:
-            - postgres-acs
+            - mysql-acs
             - activemq
-        volumes:
-            - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
     
-    postgres-acs:
-        image: postgres:${POSTGRES_TAG}
+    mysql-acs:
+        image: mysql:5.7
         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
 
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}