Merge branch 'acs' into acs-mysql
This commit is contained in:
commit
57e5ee1da5
@ -15,8 +15,10 @@ services:
|
|||||||
-Dmetadata-keystore.password=mp6yc0UD9e
|
-Dmetadata-keystore.password=mp6yc0UD9e
|
||||||
-Dmetadata-keystore.aliases=metadata
|
-Dmetadata-keystore.aliases=metadata
|
||||||
-Dmetadata-keystore.metadata.password=oKIWzVdEdA
|
-Dmetadata-keystore.metadata.password=oKIWzVdEdA
|
||||||
-Dmetadata-keystore.metadata.algorithm=DESede"
|
-Dmetadata-keystore.metadata.algorithm=DESede
|
||||||
|
"
|
||||||
JAVA_OPTS: "
|
JAVA_OPTS: "
|
||||||
|
-Xms512m -Xmx1g
|
||||||
-Ddb.driver=com.mysql.jdbc.Driver
|
-Ddb.driver=com.mysql.jdbc.Driver
|
||||||
-Ddb.username=alfresco
|
-Ddb.username=alfresco
|
||||||
-Ddb.password=alfresco
|
-Ddb.password=alfresco
|
||||||
@ -29,11 +31,9 @@ services:
|
|||||||
-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
|
||||||
-Dcsrf.filter.enabled=false
|
-Dcsrf.filter.enabled=false
|
||||||
-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
|
-Dcors.enabled=false
|
||||||
|
|
||||||
-Dtransform.service.enabled=false
|
-Dtransform.service.enabled=false
|
||||||
-Dlocal.transform.service.enabled=false
|
-Dlocal.transform.service.enabled=false
|
||||||
|
|
||||||
-Dsystem.content.eagerOrphanCleanup=true
|
-Dsystem.content.eagerOrphanCleanup=true
|
||||||
-Dsystem.content.orphanProtectDays=0
|
-Dsystem.content.orphanProtectDays=0
|
||||||
-Djodconverter.enabled=false
|
-Djodconverter.enabled=false
|
||||||
@ -44,7 +44,6 @@ services:
|
|||||||
|
|
||||||
mysql-acs:
|
mysql-acs:
|
||||||
image: mysql:5.7
|
image: mysql:5.7
|
||||||
mem_limit: 512m
|
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_RANDOM_ROOT_PASSWORD=true
|
- MYSQL_RANDOM_ROOT_PASSWORD=true
|
||||||
- MYSQL_PASSWORD=alfresco
|
- MYSQL_PASSWORD=alfresco
|
||||||
@ -53,11 +52,14 @@ services:
|
|||||||
|
|
||||||
activemq:
|
activemq:
|
||||||
image: alfresco/alfresco-activemq:${AAMQ_TAG}
|
image: alfresco/alfresco-activemq:${AAMQ_TAG}
|
||||||
|
environment:
|
||||||
|
ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
|
||||||
|
ACTIVEMQ_ADMIN_LOGIN: alfresco
|
||||||
|
ACTIVEMQ_ADMIN_PASSWORD: alfresco
|
||||||
|
|
||||||
proxy:
|
proxy:
|
||||||
build: ./nginx-ingress
|
build: ./nginx-ingress
|
||||||
image: local/nginx-ingress:acs
|
image: local/nginx-ingress:acs
|
||||||
mem_limit: 256m
|
|
||||||
ports:
|
ports:
|
||||||
- 8080:8080
|
- 8080:8080
|
||||||
depends_on:
|
depends_on:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user