Compare commits

...

30 Commits

Author SHA1 Message Date
3349cee27c added basic sharding config 2021-08-04 22:48:04 -04:00
979924957c updated ASS memory limit min 2021-07-30 15:53:20 -04:00
2a4b61053d Merge branch 'acs' into acs-search 2021-07-30 15:52:35 -04:00
brian
99d39fa7f7 Merge branch 'acs-search-base' into acs-search 2021-04-02 09:13:42 -04:00
brian
1778fd04a4 Merge branch 'acs' into acs-search 2021-04-02 09:13:41 -04:00
brian
a72d43a6af Merge branch 'acs-base' into acs-search-base 2021-04-02 09:13:30 -04:00
2878298644 Merge branch 'acs-search-base.acs-base' into acs-search.acs-search-base 2021-01-06 16:26:04 -05:00
11bb8c62ed Merge branch 'acs.acs-base' into acs-search.acs 2021-01-06 16:24:47 -05:00
962817ba63 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2021-01-06 15:56:25 -05:00
83db2b08dc Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2021-01-06 12:23:18 -05:00
fc9c26eac5 Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-26 14:02:30 -05:00
2715b3afea Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-26 14:00:14 -05:00
253b7fd3f2 Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-26 13:50:37 -05:00
9f75b4439d Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-26 13:46:21 -05:00
520e211c11 Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-25 23:38:58 -05:00
1635445cba Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-25 23:38:36 -05:00
0ed77985f0 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-25 23:32:10 -05:00
1d0aa0c91e fixed solr configuration on platform 2020-12-17 21:00:27 -05:00
7a005d16d7 Merge branch 'acs-min-community.acs-base' into acs-search-community.acs-min-community 2020-12-17 20:50:09 -05:00
b762ba0ce1 Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-17 18:53:59 -05:00
a7cacf8edc Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-17 16:35:44 -05:00
43d5686407 Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-17 16:35:11 -05:00
fbf7ca3678 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-17 16:32:50 -05:00
69974eaeea Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-17 13:24:15 -05:00
82d6fd5c8a Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-17 13:22:28 -05:00
63d1ee7ef9 changed service from solr6 to search; added service name variables 2020-12-17 13:03:32 -05:00
a081d5b5c8 Merge branch 'acs-base.base' into acs-search-base.acs-base 2020-12-17 12:56:03 -05:00
8a5004ed74 Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-community 2020-12-17 12:29:33 -05:00
7cedfa4fa2 Merge branch 'acs-base.base' into acs-search-base.acs-base 2020-12-16 23:56:43 -05:00
dcb88c42ea added minimum unconfigured search service 2020-12-16 23:44:46 -05:00

View File

@@ -1,7 +1,7 @@
# 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
# #
# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose # 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: services:
platform: platform:
@@ -13,7 +13,11 @@ services:
-Ddb.username=alfresco -Ddb.username=alfresco
-Ddb.password=alfresco -Ddb.password=alfresco
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -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
-Dsolr.useDynamicShardRegistration=true
-Dalfresco.host=${PROXY_HOST} -Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT} -Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL} -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -43,6 +47,31 @@ services:
- POSTGRES_DB=alfresco - POSTGRES_DB=alfresco
command: postgres -c max_connections=300 -c log_min_messages=LOG 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: activemq:
image: alfresco/alfresco-activemq:5.15.8 image: alfresco/alfresco-activemq:5.15.8
mem_limit: 512m mem_limit: 512m