Compare commits

..
Author SHA1 Message Date
brian.long df5c4f1848 added insight engine/zeppelin 2021-08-05 15:29:43 -04:00
brian.long 979924957c updated ASS memory limit min 2021-07-30 15:53:20 -04:00
brian.long 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
brian.long 2878298644 Merge branch 'acs-search-base.acs-base' into acs-search.acs-search-base 2021-01-06 16:26:04 -05:00
brian.long 11bb8c62ed Merge branch 'acs.acs-base' into acs-search.acs 2021-01-06 16:24:47 -05:00
brian.long 962817ba63 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2021-01-06 15:56:25 -05:00
brian.long 83db2b08dc Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2021-01-06 12:23:18 -05:00
brian.long fc9c26eac5 Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-26 14:02:30 -05:00
brian.long 2715b3afea Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-26 14:00:14 -05:00
brian.long 253b7fd3f2 Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-26 13:50:37 -05:00
brian.long 9f75b4439d Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-26 13:46:21 -05:00
brian.long 520e211c11 Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-25 23:38:58 -05:00
brian.long 1635445cba Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-25 23:38:36 -05:00
brian.long 0ed77985f0 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-25 23:32:10 -05:00
brian.long 1d0aa0c91e fixed solr configuration on platform 2020-12-17 21:00:27 -05:00
brian.long 7a005d16d7 Merge branch 'acs-min-community.acs-base' into acs-search-community.acs-min-community 2020-12-17 20:50:09 -05:00
brian.long b762ba0ce1 Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-17 18:53:59 -05:00
brian.long a7cacf8edc Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-17 16:35:44 -05:00
brian.long 43d5686407 Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-17 16:35:11 -05:00
brian.long fbf7ca3678 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-17 16:32:50 -05:00
brian.long 69974eaeea Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-17 13:24:15 -05:00
brian.long 82d6fd5c8a Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-17 13:22:28 -05:00
brian.long 63d1ee7ef9 changed service from solr6 to search; added service name variables 2020-12-17 13:03:32 -05:00
brian.long a081d5b5c8 Merge branch 'acs-base.base' into acs-search-base.acs-base 2020-12-17 12:56:03 -05:00
brian.long 8a5004ed74 Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-community 2020-12-17 12:29:33 -05:00
brian.long 7cedfa4fa2 Merge branch 'acs-base.base' into acs-search-base.acs-base 2020-12-16 23:56:43 -05:00
brian.long dcb88c42ea added minimum unconfigured search service 2020-12-16 23:44:46 -05:00
3 changed files with 35 additions and 2 deletions
+24 -2
View File
@@ -13,7 +13,10 @@ services:
-Ddb.username=alfresco
-Ddb.password=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
-Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -42,6 +45,24 @@ services:
- POSTGRES_USER=alfresco
- POSTGRES_DB=alfresco
command: postgres -c max_connections=300 -c log_min_messages=LOG
search:
image: quay.io/alfresco/insight-engine:2.0.1
mem_limit: 1g
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
insight:
image: quay.io/alfresco/insight-zeppelin:2.0.1
mem_limit: 1g
environment:
- REPO_HOST=platform
- REPO_PORT=8080
activemq:
image: alfresco/alfresco-activemq:5.15.8
@@ -49,9 +70,10 @@ services:
proxy:
build: ./nginx-ingress
image: local/nginx-ingress:acs
image: local/nginx-ingress:acs-insight
mem_limit: 256m
ports:
- 8080:8080
depends_on:
- platform
- insight
+4
View File
@@ -4,6 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then
sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
fi
if [[ $INSIGHT_URL ]]; then
sed -i s%http:\/\/insight:9090%"$INSIGHT_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
+7
View File
@@ -48,5 +48,12 @@ http {
# If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off;
}
location /zeppelin/ {
proxy_pass http://insight:9090;
# If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off;
}
}
}