Merge branch 'acs-search-base.acs-base' into acs-search.acs-search-base

.env

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

docker-compose.yml

@@ -9,11 +9,14 @@ services:
         mem_limit: 1700m
         environment:
             JAVA_OPTS: "
-                -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=noindex
+                -Dindex.subsystem.name=solr6
+                -Dsolr.host=search
+                -Dsolr.port=8983
+                -Dsolr.secureComms=none
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -31,17 +34,28 @@ services:
                 -Djodconverter.enabled=false
                 "
         depends_on:
-            - mysql-acs
+            - postgres-acs
             - activemq
     
-    mysql-acs:
+    postgres-acs:
-        image: mysql:5.7
+        image: postgres:11.7
         mem_limit: 512m
         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
+    
+    search:
+        image: alfresco/alfresco-search-services:2.0.1
+        mem_limit: 2g
+        environment:
+            - SOLR_ALFRESCO_HOST=platform
+            - SOLR_ALFRESCO_PORT=8080
+            - SOLR_SOLR_HOST=search
+            - SOLR_SOLR_PORT=8983
+            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+            - ALFRESCO_SECURE_COMMS=none
 
     activemq:
         image: alfresco/alfresco-activemq:5.15.8