Merge branch 'acs' into acs-search
This commit is contained in:
commit
d556040909
@ -14,8 +14,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=org.postgresql.Driver
|
-Ddb.driver=org.postgresql.Driver
|
||||||
-Ddb.username=alfresco
|
-Ddb.username=alfresco
|
||||||
-Ddb.password=alfresco
|
-Ddb.password=alfresco
|
||||||
@ -31,11 +33,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
|
||||||
@ -47,9 +47,9 @@ services:
|
|||||||
postgres-acs:
|
postgres-acs:
|
||||||
image: postgres:${POSTGRES_TAG}
|
image: postgres:${POSTGRES_TAG}
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_PASSWORD=alfresco
|
POSTGRES_PASSWORD: alfresco
|
||||||
- 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:
|
search:
|
||||||
@ -65,6 +65,10 @@ 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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user