Compare commits
9 Commits
acs-share-
...
acs-sync-b
Author | SHA1 | Date | |
---|---|---|---|
f5c4b00a02 | |||
9e4577222b | |||
b3a9145dd6 | |||
08ce9f6cc8 | |||
|
f10722dec9 | ||
15ccb5642b | |||
a56556b596 | |||
b1f3b14846 | |||
0b507962fa |
2
.env
2
.env
@@ -8,4 +8,4 @@ PROXY_PORT=8080
|
||||
ACS_TAG=7.4.1.1
|
||||
AAMQ_TAG=latest
|
||||
POSTGRES_TAG=13
|
||||
ACS_SHARE_TAG=7.4.1.2
|
||||
ALF_SYNC_SERV_TAG=3.9.0
|
||||
|
@@ -19,44 +19,39 @@ services:
|
||||
JAVA_OPTS: "
|
||||
-Ddb.driver=org.postgresql.Driver
|
||||
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
|
||||
-Dshare.host=${PROXY_HOST}
|
||||
-Dshare.port=${PROXY_PORT}
|
||||
-Dshare.protocol=${PROXY_PROTOCOL}
|
||||
-Dalfresco.host=${PROXY_HOST}
|
||||
-Dalfresco.port=${PROXY_PORT}
|
||||
-Dalfresco.protocol=${PROXY_PROTOCOL}
|
||||
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
|
||||
-Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
|
||||
"
|
||||
depends_on:
|
||||
- postgres-acs
|
||||
- activemq
|
||||
|
||||
share:
|
||||
image: alfresco/alfresco-share:${ACS_SHARE_TAG}
|
||||
environment:
|
||||
REPO_HOST: "platform"
|
||||
CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
|
||||
CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
|
||||
JAVA_OPTS: "
|
||||
-Dshare.host=${PROXY_HOST}
|
||||
-Dshare.port=${PROXY_PORT}
|
||||
-Dshare.protocol=${PROXY_PROTOCOL}
|
||||
-Dalfresco.host=${PROXY_HOST}
|
||||
-Dalfresco.port=${PROXY_PORT}
|
||||
-Dalfresco.protocol=${PROXY_PROTOCOL}
|
||||
"
|
||||
|
||||
postgres-acs:
|
||||
image: postgres:${POSTGRES_TAG}
|
||||
|
||||
activemq:
|
||||
image: alfresco/alfresco-activemq:${AAMQ_TAG}
|
||||
|
||||
sync:
|
||||
image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
|
||||
environment:
|
||||
JAVA_OPTS : "
|
||||
-Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
|
||||
-Dmessaging.broker.host=activemq
|
||||
-Drepo.hostname=platform
|
||||
"
|
||||
depends_on:
|
||||
- postgres-acs
|
||||
- activemq
|
||||
|
||||
proxy:
|
||||
build: ./nginx-ingress
|
||||
image: local/nginx-ingress:acs-share
|
||||
image: local/nginx-ingress:acs-sync
|
||||
ports:
|
||||
- 8080:8080
|
||||
depends_on:
|
||||
- platform
|
||||
- share
|
||||
- sync
|
||||
|
@@ -4,8 +4,8 @@ if [[ $ACS_PLATFORM_URL ]]; then
|
||||
sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
|
||||
fi
|
||||
|
||||
if [[ $ACS_SHARE_URL ]]; then
|
||||
sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf
|
||||
if [[ $ACS_SYNC_URL ]]; then
|
||||
sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf
|
||||
fi
|
||||
|
||||
if [[ $ACCESS_LOG ]]; then
|
||||
|
@@ -49,11 +49,8 @@ http {
|
||||
absolute_redirect off;
|
||||
}
|
||||
|
||||
location /share/ {
|
||||
proxy_pass http://share:8080;
|
||||
|
||||
# If using external proxy / load balancer (for initial redirect if no trailing slash)
|
||||
absolute_redirect off;
|
||||
location /sync/ {
|
||||
proxy_pass http://sync:9090/alfresco/;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user