unexposed port to solr

docker-compose.yml

@@ -1,11 +1,11 @@
 # 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"
+version: "2.1"
 
 services:
     platform:
-        image: quay.io/alfresco/alfresco-governance-repository-enterprise:V3.4-latest
+        image: alfresco/alfresco-content-repository:6.2.2.3
         mem_limit: 1700m
         environment:
             JAVA_OPTS: "
@@ -14,9 +14,10 @@ services:
                 -Ddb.password=alfresco
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
                 -Dindex.subsystem.name=solr6
-                -Dsolr.host=search
+                -Dsolr.host=search1
                 -Dsolr.port=8983
                 -Dsolr.secureComms=none
+                -Dsolr.useDynamicShardRegistration=true
                 -Dshare.host=${PROXY_HOST}
                 -Dshare.port=${PROXY_PORT}
                 -Dshare.protocol=${PROXY_PROTOCOL}
@@ -61,6 +62,7 @@ services:
     
     transform-router:
         image: quay.io/alfresco/alfresco-transform-router:1.3.1
+        mem_limit: 128m
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             CORE_AIO_URL : "http://transform-core-aio:8090"
@@ -71,6 +73,7 @@ services:
     
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:2.3.6
+        mem_limit: 1g
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
@@ -80,14 +83,12 @@ services:
 
     shared-file-store:
         image: alfresco/alfresco-shared-file-store:0.10.0
+        mem_limit: 256m
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
-    transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
-    
     share:
-        image: quay.io/alfresco/alfresco-governance-share-enterprise:V3.4-latest
+        image: alfresco/alfresco-share:6.2.2
         mem_limit: 512m
         environment:
             REPO_HOST: "platform"
@@ -104,27 +105,53 @@ services:
     
     postgres-acs:
         image: postgres:11.7
-        mem_limit: 512m
+        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:
+    search1:
-        image: alfresco/alfresco-search-services:2.0.1
+        image: docker.inteligr8.com/inteligr8/alfresco-search-services:2.0.1
-        mem_limit: 2g
+        mem_limit: 1g
         environment:
             - SOLR_ALFRESCO_HOST=platform
             - SOLR_ALFRESCO_PORT=8080
-            - SOLR_SOLR_HOST=search
+            - SOLR_SOLR_HOST=search1
             - SOLR_SOLR_PORT=8983
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
             - ALFRESCO_SECURE_COMMS=none
+        healthcheck:
+            test: "curl -fsS http://localhost:8983/solr"
+    
+    search2:
+        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=search2
+            - SOLR_SOLR_PORT=8983
+            - ALFRESCO_SECURE_COMMS=none
+        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://search1:8983/solr/admin/cores?action=newCore\\&core=alfresco\\&storeRef=workspace://SpacesStore\\&numShards=2\\&nodeInstance=1\\&numNodes=2\\&template=rerank\\&shardIds=0 &&
+            curl -s http://search2:8983/solr/admin/cores?action=newCore\\&core=alfresco\\&storeRef=workspace://SpacesStore\\&numShards=2\\&nodeInstance=2\\&numNodes=2\\&template=rerank\\&shardIds=1
+            "]
+        depends_on:
+            search1:
+                condition: service_healthy
+            search2:
+                condition: service_healthy
 
     activemq:
         image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 256m
+        mem_limit: 512m
 
     sync:
         image: quay.io/alfresco/service-sync:3.3.3.1
@@ -153,75 +180,10 @@ services:
             APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
             APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s"
     
-    activiti-app:
-        image: alfresco/process-services:1.11.1.1
-        mem_limit: 512m
-        environment:
-            ACTIVITI_DATASOURCE_USERNAME: alfresco
-            ACTIVITI_DATASOURCE_PASSWORD: alfresco
-            ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
-            ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
-            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
-            ACTIVITI_ES_SERVER_TYPE: rest
-            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
-            ACTIVITI_ES_REST_CLIENT_PORT: 9200
-            ACTIVITI_ES_REST_CLIENT_SCHEMA: http
-            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
-        depends_on:
-            - postgres-aps
-        volumes:
-            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
-    
-    activiti-admin:
-        image: alfresco/process-services-admin:1.11.1.1
-        mem_limit: 256m
-        environment:
-            ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco
-            ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco
-            ACTIVITI_ADMIN_DATASOURCE_DRIVER: org.postgresql.Driver
-            ACTIVITI_ADMIN_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
-            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
-            ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
-            ACTIVITI_ADMIN_REST_APP_PORT: 8080
-            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
-        depends_on:
-            - postgres-aps-admin
-            - activiti-app
-    
-    postgres-aps:
-        image: postgres:11.6
-        mem_limit: 256m
-        environment:
-            POSTGRES_DB: activiti
-            POSTGRES_USER: alfresco
-            POSTGRES_PASSWORD: alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
-    
-    postgres-aps-admin:
-        image: postgres:11.6
-        mem_limit: 128m
-        environment:
-            POSTGRES_DB: activiti-admin
-            POSTGRES_USER: alfresco
-            POSTGRES_PASSWORD: alfresco
-        command: postgres -c max_connections=50 -c log_min_messages=LOG
-    
-    search-aps:
-        image: elasticsearch:7.6.0
-        mem_limit: 512m
-        environment:
-            discovery.type: single-node
-            ES_JAVA_OPTS: "-Xms128m -Xmx256m"
-        ulimits:
-            memlock:
-                soft: -1
-                hard: -1
-        depends_on:
-            - activiti-app
-    
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-sync-share-adw-aps
+        image: local/nginx-ingress:acs-sync-share-adw
+        mem_limit: 256m
         ports:
             - 8080:8080
         depends_on:
@@ -229,8 +191,6 @@ services:
             - sync
             - share
             - digital-workspace
-            - activiti-app
-            - activiti-admin
 
 volumes:
     shared-file-store-volume:

nginx-ingress/entrypoint.sh

@@ -16,14 +16,6 @@ if [[ $ADW_URL ]]; then
   sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf
 fi
 
-if [[ $APS_APP_URL ]]; then
-  sed -i s%http:\/\/activiti-app:8080%"$APS_APP_URL"%g /etc/nginx/nginx.conf
-fi
-
-if [[ $APS_ADMIN_URL ]]; then
-  sed -i s%http:\/\/activiti-admin:8080%"$APS_ADMIN_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-ingress/nginx.conf

@@ -53,20 +53,6 @@ http {
             proxy_pass http://sync:9090/alfresco/;
         }
 
-        location /activiti-app/ {
-            proxy_pass http://activiti-app:8080;
-
-            # If using external proxy / load balancer (for initial redirect if no trailing slash)
-            absolute_redirect off;
-        }
-
-        location /activiti-admin/ {
-            proxy_pass http://activiti-admin:8080;
-
-            # If using external proxy / load balancer (for initial redirect if no trailing slash)
-            absolute_redirect off;
-        }
-
         location /share/ {
             proxy_pass http://share:8080;