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

docker-compose.yml

@@ -1,7 +1,7 @@
 # Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
 # Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
-version: "2.1"
+version: "2"
 
 services:
     platform:
@@ -9,15 +9,11 @@ services:
         mem_limit: 1700m
         environment:
             JAVA_OPTS: "
-                -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=solr6
+                -Dindex.subsystem.name=noindex
-                -Dsolr.host=search
-                -Dsolr.port=8983
-                -Dsolr.secureComms=none
-                -Dsolr.useDynamicShardRegistration=true
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -35,51 +31,25 @@ services:
                 -Djodconverter.enabled=false
                 "
         depends_on:
-            - postgres-acs
+            - mysql-acs
             - activemq
     
-    postgres-acs:
+    mysql-acs:
-        image: postgres:11.7
+        image: mysql:5.7
-        mem_limit: 128m
+        mem_limit: 512m
         environment:
-            - POSTGRES_PASSWORD=alfresco
+            - MYSQL_RANDOM_ROOT_PASSWORD=true
-            - POSTGRES_USER=alfresco
+            - MYSQL_PASSWORD=alfresco
-            - POSTGRES_DB=alfresco
+            - MYSQL_USER=alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
+            - MYSQL_DATABASE=alfresco
-    
-    search:
-        image: docker.inteligr8.com/inteligr8/alfresco-search-services:2.0.1
-        mem_limit: 1g
-        environment:
-            - SOLR_ALFRESCO_HOST=platform
-            - SOLR_ALFRESCO_PORT=8080
-            - SOLR_SOLR_HOST=search
-            - SOLR_SOLR_PORT=8983
-            - ALFRESCO_SECURE_COMMS=none
-        ports:
-            - 8983:8983
-        healthcheck:
-            test: "curl -fsS http://localhost:8983/solr"
-    
-    search-shard-init:
-        image: cfmanteiga/alpine-bash-curl-jq
-        mem_limit: 64m
-        command: [ "bash", "-c", "
-            curl -s http://search:8983/solr/admin/cores?action=newCore\\&core=alfresco\\&storeRef=workspace://SpacesStore\\&numShards=2\\&nodeInstance=1\\&numNodes=1\\&template=rerank\\&shardIds=1,2 &&
-            curl -s http://search:8983/solr/admin/cores?action=rename\\&core=alfresco-1\\&other=alfresco
-            "]
-        depends_on:
-            search:
-                condition: service_healthy
 
     activemq:
         image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 512m
+        mem_limit: 256m
 
     proxy:
         build: ./nginx-ingress
         image: local/nginx-ingress:acs
-        mem_limit: 256m
         ports:
             - 8080:8080
         depends_on: