Compare commits
9 Commits
acs-adw-ba
...
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
|
ACS_TAG=7.4.1.1
|
||||||
AAMQ_TAG=latest
|
AAMQ_TAG=latest
|
||||||
POSTGRES_TAG=13
|
POSTGRES_TAG=13
|
||||||
ADW_TAG=4.1.0
|
ALF_SYNC_SERV_TAG=3.9.0
|
||||||
|
@@ -23,6 +23,7 @@ services:
|
|||||||
-Dalfresco.port=${PROXY_PORT}
|
-Dalfresco.port=${PROXY_PORT}
|
||||||
-Dalfresco.protocol=${PROXY_PROTOCOL}
|
-Dalfresco.protocol=${PROXY_PROTOCOL}
|
||||||
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
|
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
|
||||||
|
-Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
|
||||||
"
|
"
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgres-acs
|
- postgres-acs
|
||||||
@@ -34,16 +35,23 @@ services:
|
|||||||
activemq:
|
activemq:
|
||||||
image: alfresco/alfresco-activemq:${AAMQ_TAG}
|
image: alfresco/alfresco-activemq:${AAMQ_TAG}
|
||||||
|
|
||||||
digital-workspace:
|
sync:
|
||||||
image: quay.io/alfresco/alfresco-digital-workspace:${ADW_TAG}
|
image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
|
||||||
environment:
|
environment:
|
||||||
APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
|
JAVA_OPTS : "
|
||||||
|
-Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
|
||||||
|
-Dmessaging.broker.host=activemq
|
||||||
|
-Drepo.hostname=platform
|
||||||
|
"
|
||||||
|
depends_on:
|
||||||
|
- postgres-acs
|
||||||
|
- activemq
|
||||||
|
|
||||||
proxy:
|
proxy:
|
||||||
build: ./nginx-ingress
|
build: ./nginx-ingress
|
||||||
image: local/nginx-ingress:acs-adw
|
image: local/nginx-ingress:acs-sync
|
||||||
ports:
|
ports:
|
||||||
- 8080:8080
|
- 8080:8080
|
||||||
depends_on:
|
depends_on:
|
||||||
- platform
|
- platform
|
||||||
- digital-workspace
|
- sync
|
||||||
|
@@ -4,8 +4,8 @@ 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 [[ $ADW_URL ]]; then
|
if [[ $ACS_SYNC_URL ]]; then
|
||||||
sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf
|
sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $ACCESS_LOG ]]; then
|
if [[ $ACCESS_LOG ]]; then
|
||||||
|
@@ -49,11 +49,8 @@ http {
|
|||||||
absolute_redirect off;
|
absolute_redirect off;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /workspace/ {
|
location /sync/ {
|
||||||
proxy_pass http://digital-workspace:8080/;
|
proxy_pass http://sync:9090/alfresco/;
|
||||||
|
|
||||||
# If using external proxy / load balancer (for initial redirect if no trailing slash)
|
|
||||||
absolute_redirect off;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user