Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist
This commit is contained in:
commit
551f7bbf5f
4
.env
4
.env
@ -6,8 +6,12 @@ PROXY_HOST=localhost
|
|||||||
PROXY_PORT=8080
|
PROXY_PORT=8080
|
||||||
|
|
||||||
ACS_TAG=7.3.0
|
ACS_TAG=7.3.0
|
||||||
|
ATR_TAG=2.0.0
|
||||||
ATE_AIO_TAG=3.0.0
|
ATE_AIO_TAG=3.0.0
|
||||||
|
ASFS_TAG=2.0.0
|
||||||
AAMQ_TAG=5.17.1-jre17-centos7
|
AAMQ_TAG=5.17.1-jre17-centos7
|
||||||
POSTGRES_TAG=13
|
POSTGRES_TAG=13
|
||||||
ASIE_TAG=2.0.5
|
ASIE_TAG=2.0.5
|
||||||
ACS_SHARE_TAG=7.3.0
|
ACS_SHARE_TAG=7.3.0
|
||||||
|
ALF_SYNC_SERV_TAG=3.7
|
||||||
|
ADW_TAG=3.1.0
|
||||||
|
@ -35,13 +35,8 @@ services:
|
|||||||
-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
|
||||||
|
-Dcors.enabled=false
|
||||||
-Dtransform.service.enabled=true
|
-Dtransform.service.enabled=true
|
||||||
-Dtransform.service.url=http://transform-router:8095
|
-Dtransform.service.url=http://transform-router:8095
|
||||||
-Dsfs.url=http://shared-file-store:8099
|
-Dsfs.url=http://shared-file-store:8099
|
||||||
@ -52,7 +47,6 @@ services:
|
|||||||
-Dtika.url=http://transform-engine-aio:8090
|
-Dtika.url=http://transform-engine-aio:8090
|
||||||
-Dtransform.misc.url=http://transform-engine-aio:8090
|
-Dtransform.misc.url=http://transform-engine-aio:8090
|
||||||
-Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
|
-Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
|
||||||
-Dcors.enabled=false
|
|
||||||
-Dsystem.content.eagerOrphanCleanup=true
|
-Dsystem.content.eagerOrphanCleanup=true
|
||||||
-Dsystem.content.orphanProtectDays=0
|
-Dsystem.content.orphanProtectDays=0
|
||||||
-Djodconverter.enabled=false
|
-Djodconverter.enabled=false
|
||||||
@ -66,8 +60,7 @@ services:
|
|||||||
- acsbin-volume:/usr/local/tomcat/alf_data:rw
|
- acsbin-volume:/usr/local/tomcat/alf_data:rw
|
||||||
|
|
||||||
transform-router:
|
transform-router:
|
||||||
image: quay.io/alfresco/alfresco-transform-router:1.3.1
|
image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
|
||||||
mem_limit: 128m
|
|
||||||
environment:
|
environment:
|
||||||
ACTIVEMQ_URL: "nio://activemq:61616"
|
ACTIVEMQ_URL: "nio://activemq:61616"
|
||||||
CORE_AIO_URL : "http://transform-core-aio:8090"
|
CORE_AIO_URL : "http://transform-core-aio:8090"
|
||||||
@ -77,8 +70,7 @@ services:
|
|||||||
- shared-file-store
|
- shared-file-store
|
||||||
|
|
||||||
transform-core-aio:
|
transform-core-aio:
|
||||||
image: alfresco/alfresco-transform-core-aio:2.3.6
|
image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
|
||||||
mem_limit: 1g
|
|
||||||
environment:
|
environment:
|
||||||
ACTIVEMQ_URL: "nio://activemq:61616"
|
ACTIVEMQ_URL: "nio://activemq:61616"
|
||||||
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
|
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
|
||||||
@ -87,8 +79,7 @@ services:
|
|||||||
- shared-file-store
|
- shared-file-store
|
||||||
|
|
||||||
shared-file-store:
|
shared-file-store:
|
||||||
image: alfresco/alfresco-shared-file-store:0.10.0
|
image: quay.io/alfresco/alfresco-shared-file-store:${ASFS_TAG}
|
||||||
mem_limit: 256m
|
|
||||||
volumes:
|
volumes:
|
||||||
- shared-file-store-volume:/tmp/Alfresco/sfs
|
- shared-file-store-volume:/tmp/Alfresco/sfs
|
||||||
|
|
||||||
@ -140,10 +131,10 @@ services:
|
|||||||
- activemq-volume:/opt/activemq/data:rw
|
- activemq-volume:/opt/activemq/data:rw
|
||||||
|
|
||||||
sync:
|
sync:
|
||||||
image: quay.io/alfresco/service-sync:3.3.3.1
|
image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
|
||||||
mem_limit: 512m
|
|
||||||
environment:
|
environment:
|
||||||
JAVA_OPTS : "
|
JAVA_OPTS : "
|
||||||
|
-Xms64m -Xmx256m
|
||||||
-Dsql.db.driver=org.postgresql.Driver
|
-Dsql.db.driver=org.postgresql.Driver
|
||||||
-Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
|
-Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
|
||||||
-Dsql.db.username=alfresco
|
-Dsql.db.username=alfresco
|
||||||
@ -152,15 +143,13 @@ services:
|
|||||||
-Drepo.hostname=platform
|
-Drepo.hostname=platform
|
||||||
-Drepo.port=8080
|
-Drepo.port=8080
|
||||||
-Ddw.server.applicationConnectors[0].type=http
|
-Ddw.server.applicationConnectors[0].type=http
|
||||||
-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
|
|
||||||
"
|
"
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgres-acs
|
- postgres-acs
|
||||||
- activemq
|
- activemq
|
||||||
|
|
||||||
digital-workspace:
|
digital-workspace:
|
||||||
image: quay.io/alfresco/alfresco-digital-workspace:2.0.0-adw
|
image: quay.io/alfresco/alfresco-digital-workspace:${ADW_TAG}
|
||||||
mem_limit: 128m
|
|
||||||
environment:
|
environment:
|
||||||
BASE_PATH: ./
|
BASE_PATH: ./
|
||||||
APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
|
APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user