Compare commits

...

19 Commits

Author SHA1 Message Date
brian
07e0d14f42 Merge branch 'acs-mysql-base' into acs-mysql 2021-04-02 09:14:14 -04:00
brian
94a2a3a259 Merge branch 'acs' into acs-mysql 2021-04-02 09:14:13 -04:00
brian
d616b9ef3a Merge branch 'acs-base' into acs 2021-04-02 09:13:32 -04:00
b59eae3b5f Merge branch 'acs' into acs-mysql 2021-01-11 22:47:08 -05:00
dc3dd8ca74 Merge branch 'acs-mysql-base.acs-base' into acs-mysql.acs-mysql-base 2021-01-06 16:00:28 -05:00
d70efc6943 parameterized AOS 2021-01-06 15:19:41 -05:00
a3cb815dd1 Merge branch 'acs-base.proxy' into acs-community.acs-base 2021-01-06 12:22:27 -05:00
82b58f638c Merge branch 'acs-community.acs-base' into acs-mysql-community.acs-community 2020-12-26 13:58:35 -05:00
55b70f1a36 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-26 13:58:15 -05:00
5a929f6317 Merge branch 'acs-community.acs-base' into acs-mysql-community.acs-community 2020-12-26 13:39:03 -05:00
3ac57ce7d1 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-26 13:37:05 -05:00
6ec4a797ca Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-25 23:38:22 -05:00
60b5a8989b changed from v6.2.2-RC1 to v6.2.0-ga 2020-12-17 20:42:54 -05:00
c22af67a06 disabled jodconverter in platform 2020-12-17 18:53:34 -05:00
e29e80b650 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-17 16:34:26 -05:00
90e935a49e minor fixes 2020-12-17 13:22:05 -05:00
6e32209824 Merge branch 'acs-base.base' into acs-community.acs-base 2020-12-17 13:20:59 -05:00
d0a62bfd24 Merge branch 'acs-base.base' into acs-community.acs-base 2020-12-16 23:57:29 -05:00
723f3ec954 configured for ACS community v6.2.2-RC1 2020-12-16 23:55:00 -05:00

View File

@@ -5,25 +5,47 @@ version: "2"
services: services:
platform: platform:
image: alfresco/alfresco-content-repository:latest image: alfresco/alfresco-content-repository-community:6.2.0-ga
mem_limit: 1700m
environment: environment:
JAVA_OPTS: " JAVA_OPTS: "
-Ddb.driver=com.mysql.jdbc.Driver -Ddb.driver=com.mysql.jdbc.Driver
-Ddb.username=alfresco
-Ddb.password=alfresco
-Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false -Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
-Dindex.subsystem.name=noindex
-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
-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
-Dcsrf.filter.enabled=false
-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-Dtransform.service.enabled=false
-Dlocal.transform.service.enabled=false
-Dsystem.content.eagerOrphanCleanup=true
-Dsystem.content.orphanProtectDays=0
-Djodconverter.enabled=false
" "
depends_on: depends_on:
- mysql-acs - mysql-acs
- activemq - activemq
mysql-acs: mysql-acs:
image: mysql:latest image: mysql:5.7
mem_limit: 512m
environment:
- MYSQL_RANDOM_ROOT_PASSWORD=true
- MYSQL_PASSWORD=alfresco
- MYSQL_USER=alfresco
- MYSQL_DATABASE=alfresco
activemq: activemq:
image: alfresco/alfresco-activemq:latest image: alfresco/alfresco-activemq:5.15.8
mem_limit: 256m
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress