Compare commits
30 Commits
acs-v6
...
propagate/
Author | SHA1 | Date | |
---|---|---|---|
df5c4f1848 | |||
979924957c | |||
2a4b61053d | |||
|
99d39fa7f7 | ||
|
1778fd04a4 | ||
|
a72d43a6af | ||
2878298644 | |||
11bb8c62ed | |||
962817ba63 | |||
83db2b08dc | |||
fc9c26eac5 | |||
2715b3afea | |||
253b7fd3f2 | |||
9f75b4439d | |||
520e211c11 | |||
1635445cba | |||
0ed77985f0 | |||
1d0aa0c91e | |||
7a005d16d7 | |||
b762ba0ce1 | |||
a7cacf8edc | |||
43d5686407 | |||
fbf7ca3678 | |||
69974eaeea | |||
82d6fd5c8a | |||
63d1ee7ef9 | |||
a081d5b5c8 | |||
8a5004ed74 | |||
7cedfa4fa2 | |||
dcb88c42ea |
@@ -13,7 +13,10 @@ 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
|
||||||
-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,15 +46,34 @@ 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: 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:
|
activemq:
|
||||||
image: alfresco/alfresco-activemq:5.15.8
|
image: alfresco/alfresco-activemq:5.15.8
|
||||||
mem_limit: 512m
|
mem_limit: 512m
|
||||||
|
|
||||||
proxy:
|
proxy:
|
||||||
build: ./nginx-ingress
|
build: ./nginx-ingress
|
||||||
image: local/nginx-ingress:acs
|
image: local/nginx-ingress:acs-insight
|
||||||
mem_limit: 256m
|
mem_limit: 256m
|
||||||
ports:
|
ports:
|
||||||
- 8080:8080
|
- 8080:8080
|
||||||
depends_on:
|
depends_on:
|
||||||
- platform
|
- platform
|
||||||
|
- insight
|
||||||
|
@@ -4,6 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then
|
|||||||
sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
|
sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ $INSIGHT_URL ]]; then
|
||||||
|
sed -i s%http:\/\/insight:9090%"$INSIGHT_URL"%g /etc/nginx/nginx.conf
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ $ACCESS_LOG ]]; then
|
if [[ $ACCESS_LOG ]]; then
|
||||||
sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
|
sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
|
||||||
fi
|
fi
|
||||||
|
@@ -48,5 +48,12 @@ http {
|
|||||||
# If using external proxy / load balancer (for initial redirect if no trailing slash)
|
# If using external proxy / load balancer (for initial redirect if no trailing slash)
|
||||||
absolute_redirect off;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user