Compare commits
161 Commits
acs-v6
...
propagate/
Author | SHA1 | Date | |
---|---|---|---|
f90a541ec2 | |||
|
f52aee275e | ||
|
c2c340f61e | ||
c9d1646933 | |||
|
26adfeee1c | ||
|
68d0eeab49 | ||
|
456950f31d | ||
|
6740f23779 | ||
|
880221a953 | ||
|
398d6692f8 | ||
|
b6f2befafb | ||
|
c11990900c | ||
|
e07cea5ffa | ||
|
29f4ca7c54 | ||
|
73fea3d13d | ||
|
910cc2e2cb | ||
|
99d39fa7f7 | ||
|
1778fd04a4 | ||
|
a72d43a6af | ||
|
5a16e389c4 | ||
|
f10722dec9 | ||
|
ec00d1a445 | ||
|
bf09b85448 | ||
39928d09fc | |||
9859e68fe8 | |||
4dccd7892f | |||
6471292c34 | |||
7114bb5de1 | |||
5ea48c405f | |||
|
e222fc3fba | ||
3b5fc8c096 | |||
41858ebddb | |||
5788051f22 | |||
b534456065 | |||
ac7e691100 | |||
15ccb5642b | |||
4349851dd9 | |||
de8920ba0b | |||
9b3ba22ca1 | |||
69531bde6d | |||
766b2ebfd0 | |||
078b2ae35c | |||
5ff71f0e3c | |||
2878298644 | |||
11bb8c62ed | |||
30f3420ee5 | |||
677a3e1dc8 | |||
76dc8c7ad9 | |||
b024fd8d7e | |||
8a36f91d06 | |||
2ec11a1135 | |||
962817ba63 | |||
3ef69c527b | |||
a56556b596 | |||
0a0cb15580 | |||
d3b41dcc46 | |||
37de03317b | |||
dc9fb0abfa | |||
68dc071342 | |||
78ec9c2a94 | |||
cafee75cdc | |||
9e2ce6b967 | |||
e660d79ef1 | |||
f036e13180 | |||
83db2b08dc | |||
40207d43ff | |||
a0c6074358 | |||
4afdf95b44 | |||
b3001c56ff | |||
89ffe20aee | |||
d4f4b6217e | |||
41b87a9e5e | |||
86ad2bc409 | |||
2a56247aa1 | |||
efb9210c5a | |||
48d46aa70c | |||
b47583a716 | |||
fc9c26eac5 | |||
2715b3afea | |||
f2ac689f85 | |||
2367651a7e | |||
b8b267d4c5 | |||
253b7fd3f2 | |||
9f75b4439d | |||
68fcb3cbef | |||
4381a2d350 | |||
573ab3d2cb | |||
c2795cd76c | |||
17f70ea253 | |||
2173a9eb5b | |||
8e1a7f11ca | |||
ca1eaa8bff | |||
520e211c11 | |||
1635445cba | |||
b1f3b14846 | |||
04f44ef280 | |||
32ad6d8195 | |||
0ed77985f0 | |||
4b9900a7fd | |||
56492a45c8 | |||
ce9b143fb5 | |||
ce899a9480 | |||
701489665a | |||
0976a3975f | |||
22d1220a14 | |||
0ad2cdf9ad | |||
1d0aa0c91e | |||
7a005d16d7 | |||
eb11f51348 | |||
7bb62f421e | |||
f02d4ff427 | |||
1e09466e78 | |||
b762ba0ce1 | |||
0b507962fa | |||
f73fdbb5ea | |||
1216469feb | |||
6a6dbdc798 | |||
2ac3d013c9 | |||
80a938d674 | |||
ddb535ab14 | |||
8be9a0749a | |||
0bd09b8cbd | |||
a7cacf8edc | |||
43d5686407 | |||
331eda62fc | |||
fbf7ca3678 | |||
ff5442c869 | |||
4cb5100065 | |||
f239550be7 | |||
3b631bcd87 | |||
e5824d17e1 | |||
5cd3530ef0 | |||
d6f1c99c79 | |||
6d35ffa551 | |||
6c739c5795 | |||
055119eeb5 | |||
75df5099e9 | |||
69974eaeea | |||
82d6fd5c8a | |||
0bb3b7bb28 | |||
f97b6b973b | |||
63d1ee7ef9 | |||
a081d5b5c8 | |||
c084972d39 | |||
b9fb8971dd | |||
487a677f6f | |||
0608045c1b | |||
8296a96294 | |||
79ef1f5868 | |||
8c480402ed | |||
8a5004ed74 | |||
3fea801d26 | |||
7cedfa4fa2 | |||
72f7960369 | |||
4f036e530b | |||
6858d201c2 | |||
dcb88c42ea | |||
00e0a17249 | |||
89626fcd1d | |||
bfa65c999e | |||
c1323a8171 |
@@ -5,7 +5,7 @@ version: "2"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
platform:
|
platform:
|
||||||
image: alfresco/alfresco-content-repository-community:6.2.0-ga
|
image: alfresco/alfresco-content-repository:6.2.2.3
|
||||||
mem_limit: 1700m
|
mem_limit: 1700m
|
||||||
environment:
|
environment:
|
||||||
JAVA_OPTS: "
|
JAVA_OPTS: "
|
||||||
@@ -13,18 +13,40 @@ 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
|
||||||
|
-Dshare.host=${PROXY_HOST}
|
||||||
|
-Dshare.port=${PROXY_PORT}
|
||||||
|
-Dshare.protocol=${PROXY_PROTOCOL}
|
||||||
-Dalfresco.host=${PROXY_HOST}
|
-Dalfresco.host=${PROXY_HOST}
|
||||||
-Dalfresco.port=${PROXY_PORT}
|
-Dalfresco.port=${PROXY_PORT}
|
||||||
-Dalfresco.protocol=${PROXY_PROTOCOL}
|
-Dalfresco.protocol=${PROXY_PROTOCOL}
|
||||||
-Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
|
-Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
|
||||||
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
|
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
|
||||||
-Ddeployment.method=DOCKER_COMPOSE
|
-Ddeployment.method=DOCKER_COMPOSE
|
||||||
|
-DlocalTransform.core-aio.url=http://transform-core-aio:8090/
|
||||||
|
-Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
|
||||||
|
-Djodconverter.url=http://transform-core-aio:8090/
|
||||||
|
-Dimg.url=http://transform-core-aio:8090/
|
||||||
|
-Dtika.url=http://transform-core-aio:8090/
|
||||||
|
-Dtransform.misc.url=http://transform-core-aio:8090/
|
||||||
-Dcsrf.filter.enabled=false
|
-Dcsrf.filter.enabled=false
|
||||||
-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
|
-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
|
||||||
|
|
||||||
-Dtransform.service.enabled=false
|
-Dtransform.service.enabled=true
|
||||||
-Dlocal.transform.service.enabled=false
|
-Dlocal.transform.service.enabled=false
|
||||||
|
|
||||||
|
-Dtransform.service.url=http://transform-router:8095
|
||||||
|
-Dsfs.url=http://shared-file-store:8099
|
||||||
|
-Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090
|
||||||
|
-Djodconverter.url=http://transform-engine-aio:8090
|
||||||
|
-Dimg.url=http://transform-engine-aio:8090
|
||||||
|
-Dtika.url=http://transform-engine-aio:8090
|
||||||
|
-Dtransform.misc.url=http://transform-engine-aio:8090
|
||||||
|
|
||||||
|
-Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
|
||||||
|
|
||||||
-Dsystem.content.eagerOrphanCleanup=true
|
-Dsystem.content.eagerOrphanCleanup=true
|
||||||
-Dsystem.content.orphanProtectDays=0
|
-Dsystem.content.orphanProtectDays=0
|
||||||
@@ -33,6 +55,49 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- postgres-acs
|
- postgres-acs
|
||||||
- activemq
|
- activemq
|
||||||
|
- shared-file-store
|
||||||
|
volumes:
|
||||||
|
- "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
|
||||||
|
|
||||||
|
transform-router:
|
||||||
|
image: quay.io/alfresco/alfresco-transform-router:1.3.1
|
||||||
|
environment:
|
||||||
|
ACTIVEMQ_URL: "nio://activemq:61616"
|
||||||
|
CORE_AIO_URL : "http://transform-core-aio:8090"
|
||||||
|
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
|
||||||
|
depends_on:
|
||||||
|
- activemq
|
||||||
|
- shared-file-store
|
||||||
|
|
||||||
|
transform-core-aio:
|
||||||
|
image: alfresco/alfresco-transform-core-aio:2.3.6
|
||||||
|
environment:
|
||||||
|
ACTIVEMQ_URL: "nio://activemq:61616"
|
||||||
|
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
|
||||||
|
depends_on:
|
||||||
|
- activemq
|
||||||
|
- shared-file-store
|
||||||
|
|
||||||
|
shared-file-store:
|
||||||
|
image: alfresco/alfresco-shared-file-store:0.10.0
|
||||||
|
volumes:
|
||||||
|
- shared-file-store-volume:/tmp/Alfresco/sfs
|
||||||
|
|
||||||
|
share:
|
||||||
|
image: alfresco/alfresco-share:6.2.2
|
||||||
|
mem_limit: 512m
|
||||||
|
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:
|
postgres-acs:
|
||||||
image: postgres:11.7
|
image: postgres:11.7
|
||||||
@@ -42,15 +107,62 @@ services:
|
|||||||
- POSTGRES_USER=alfresco
|
- POSTGRES_USER=alfresco
|
||||||
- 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: alfresco/alfresco-search-services:2.0.1
|
||||||
|
mem_limit: 2g
|
||||||
|
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
|
||||||
|
|
||||||
activemq:
|
activemq:
|
||||||
image: alfresco/alfresco-activemq:5.15.8
|
image: alfresco/alfresco-activemq:5.15.8
|
||||||
mem_limit: 256m
|
mem_limit: 256m
|
||||||
|
|
||||||
|
sync:
|
||||||
|
image: quay.io/alfresco/service-sync:3.3.3.1
|
||||||
|
mem_limit: 512m
|
||||||
|
environment:
|
||||||
|
JAVA_OPTS : "
|
||||||
|
-Dsql.db.driver=org.postgresql.Driver
|
||||||
|
-Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
|
||||||
|
-Dsql.db.username=alfresco
|
||||||
|
-Dsql.db.password=alfresco
|
||||||
|
-Dmessaging.broker.host=activemq
|
||||||
|
-Drepo.hostname=platform
|
||||||
|
-Drepo.port=8080
|
||||||
|
-Ddw.server.applicationConnectors[0].type=http
|
||||||
|
-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
|
||||||
|
"
|
||||||
|
depends_on:
|
||||||
|
- postgres-acs
|
||||||
|
- activemq
|
||||||
|
|
||||||
|
digital-workspace:
|
||||||
|
image: quay.io/alfresco/alfresco-digital-workspace:2.0.0-adw
|
||||||
|
mem_limit: 128m
|
||||||
|
environment:
|
||||||
|
BASE_PATH: ./
|
||||||
|
APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
|
||||||
|
APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s"
|
||||||
|
|
||||||
proxy:
|
proxy:
|
||||||
build: ./nginx-ingress
|
build: ./nginx-ingress
|
||||||
image: local/nginx-ingress:acs
|
image: local/nginx-ingress:acs-sync-share-adw
|
||||||
ports:
|
ports:
|
||||||
- 8080:8080
|
- 8080:8080
|
||||||
depends_on:
|
depends_on:
|
||||||
- platform
|
- platform
|
||||||
|
- sync
|
||||||
|
- share
|
||||||
|
- digital-workspace
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
shared-file-store-volume:
|
||||||
|
driver_opts:
|
||||||
|
type: tmpfs
|
||||||
|
device: tmpfs
|
||||||
|
@@ -4,6 +4,18 @@ 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 [[ $ACS_SYNC_URL ]]; then
|
||||||
|
sed -i s%http:\/\/sync:9090%"$ACS_SYNC_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
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $ADW_URL ]]; then
|
||||||
|
sed -i s%http:\/\/digital-workspace:8080%"$ADW_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,23 @@ 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 /sync/ {
|
||||||
|
proxy_pass http://sync:9090/alfresco/;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /share/ {
|
||||||
|
proxy_pass http://share:8080;
|
||||||
|
|
||||||
|
# If using external proxy / load balancer (for initial redirect if no trailing slash)
|
||||||
|
absolute_redirect off;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /workspace/ {
|
||||||
|
proxy_pass http://digital-workspace:8080/;
|
||||||
|
|
||||||
|
# If using external proxy / load balancer (for initial redirect if no trailing slash)
|
||||||
|
absolute_redirect off;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user