added basic sharding config

.env

@@ -0,0 +1,6 @@
+ALFRESCO_DIR=~/alfresco
+ALFRESCO_LICENSE_DIR=~/alfresco/license
+
+PROXY_PROTOCOL=http
+PROXY_HOST=localhost
+PROXY_PORT=8080

docker-compose.yml

@@ -1,16 +1,86 @@
-# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-version: "3"
+# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
+version: "2.1"
 
 services:
-
-    directory:
-        image: osixia/openldap:1.4.0
+    platform:
+        image: alfresco/alfresco-content-repository-community:6.2.0-ga
+        mem_limit: 1700m
         environment:
-            LDAP_ORGANISATION: "Example Organization"
-            LDAP_DOMAIN: example.org
-            LDAP_ADMIN_PASSWORD: admin
-        command: "--copy-service --loglevel=debug"
-        volumes:
-            - ./openldap-example.ldif:/container/service/slapd/assets/config/bootstrap/ldif/50-bootstrap.ldif:ro
+            JAVA_OPTS: "
+                -Ddb.driver=org.postgresql.Driver
+                -Ddb.username=alfresco
+                -Ddb.password=alfresco
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Dindex.subsystem.name=solr6
+                -Dsolr.host=search
+                -Dsolr.port=8983
+                -Dsolr.secureComms=none
+                -Dsolr.useDynamicShardRegistration=true
+                -Dalfresco.host=${PROXY_HOST}
+                -Dalfresco.port=${PROXY_PORT}
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
+                -Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
+                -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
+                -Ddeployment.method=DOCKER_COMPOSE
+                -Dcsrf.filter.enabled=false
+                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
 
+                -Dtransform.service.enabled=false
+                -Dlocal.transform.service.enabled=false
+                
+                -Dsystem.content.eagerOrphanCleanup=true
+                -Dsystem.content.orphanProtectDays=0
+                -Djodconverter.enabled=false
+                "
+        depends_on:
+            - postgres-acs
+            - activemq
+    
+    postgres-acs:
+        image: postgres:11.7
+        mem_limit: 128m
+        environment:
+            - POSTGRES_PASSWORD=alfresco
+            - POSTGRES_USER=alfresco
+            - POSTGRES_DB=alfresco
+        command: postgres -c max_connections=300 -c log_min_messages=LOG
+    
+    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
+
+    proxy:
+        build: ./nginx-ingress
+        image: local/nginx-ingress:acs
+        mem_limit: 256m
+        ports:
+            - 8080:8080
+        depends_on:
+            - platform

nginx-ingress/Dockerfile

@@ -0,0 +1,8 @@
+FROM nginx:stable-alpine
+
+COPY nginx.conf /etc/nginx/nginx.conf
+
+COPY entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT [ "/entrypoint.sh" ]

nginx-ingress/entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [[ $ACS_PLATFORM_URL ]]; then
+  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
+fi
+
+if [[ $ACCESS_LOG ]]; then
+  sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
+fi
+
+nginx -g "daemon off;"

nginx-ingress/nginx.conf

@@ -0,0 +1,52 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    server {
+        listen *:8080;
+
+        client_max_body_size 0;
+
+        set  $allowOriginSite *;
+        proxy_pass_request_headers on;
+        proxy_pass_header Set-Cookie;
+
+        # External settings, do not remove
+        #ENV_ACCESS_LOG
+
+        proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
+        proxy_redirect off;
+        proxy_buffering off;
+        proxy_set_header Host              $http_host;
+        proxy_set_header X-Real-IP         $remote_addr;
+        proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass_header Set-Cookie;
+        
+        # Protect access to SOLR APIs
+        location ~ ^(/.*/service/api/solr/.*)$ {return 403;}
+        location ~ ^(/.*/s/api/solr/.*)$ {return 403;}
+        location ~ ^(/.*/wcservice/api/solr/.*)$ {return 403;}
+        location ~ ^(/.*/wcs/api/solr/.*)$ {return 403;}
+
+        location ~ ^(/.*/proxy/alfresco/api/solr/.*)$ {return 403 ;}
+        location ~ ^(/.*/-default-/proxy/alfresco/api/.*)$ {return 403;}
+        
+        # Protect access to Prometheus endpoint
+        location ~ ^(/.*/s/prometheus)$ {return 403;}
+        
+        location / {
+            proxy_pass http://platform:8080;
+        }
+
+        location /alfresco/ {
+            proxy_pass http://platform:8080;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
+    }
+}

openldap-example.ldif

@@ -1,80 +0,0 @@
-version: 1
-
-dn: uid=admin.1,dc=example,dc=org
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-objectClass: uidObject
-objectClass: simpleSecurityObject
-objectClass: mailAccount
-cn: #1
-sn: Administrator
-uid: admin.1
-userPassword: {SSHA}m2qOFBapko4Bky4vbQYCVyW4+KWeuswg/BqObw==
-mail: admin.1@example.org
-
-dn: uid=manager.1,dc=example,dc=org
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-objectClass: uidObject
-objectClass: simpleSecurityObject
-objectClass: mailAccount
-cn: #1
-sn: Manager
-uid: manager.1
-userPassword: {SSHA}m2qOFBapko4Bky4vbQYCVyW4+KWeuswg/BqObw==
-mail: manager.1@example.org
-
-dn: uid=user.1,dc=example,dc=org
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-objectClass: uidObject
-objectClass: simpleSecurityObject
-objectClass: mailAccount
-cn: #1
-sn: User
-uid: user.1
-userPassword: {SSHA}m2qOFBapko4Bky4vbQYCVyW4+KWeuswg/BqObw==
-mail: user.1@example.org
-
-dn: uid=user.2,dc=example,dc=org
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-objectClass: uidObject
-objectClass: simpleSecurityObject
-objectClass: mailAccount
-cn: #2
-sn: User
-uid: user.2
-userPassword: {SSHA}m2qOFBapko4Bky4vbQYCVyW4+KWeuswg/BqObw==
-mail: user.2@example.org
-
-dn: cn=power-users,dc=example,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: power-users
-member: uid=manager.1,dc=example,dc=org
-
-dn: cn=admins,dc=example,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: admins
-member: uid=admin.1,dc=example,dc=org
-
-dn: cn=acs-users,dc=example,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: acs-users
-member: cn=power-users,dc=example,dc=org
-member: uid=user.1,dc=example,dc=org
-
-dn: cn=aps-users,dc=example,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: aps-users
-member: cn=power-users,dc=example,dc=org
-member: uid=user.2,dc=example,dc=org
-