Merge branch 'acs-backend' into ags-backend

This commit is contained in:
Brian Long 2022-11-01 17:24:58 -04:00
commit 8434976fd0
2 changed files with 14 additions and 13 deletions

2
.env
View File

@ -6,5 +6,7 @@ PROXY_HOST=localhost
PROXY_PORT=8080 PROXY_PORT=8080
ACS_TAG=7.3.0 ACS_TAG=7.3.0
ATE_AIO_TAG=3.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

View File

@ -24,8 +24,8 @@ services:
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-Dindex.subsystem.name=solr6 -Dindex.subsystem.name=solr6
-Dsolr.host=search -Dsolr.host=search
-Dsolr.port=8983 -Dsolr.secureComms=secret
-Dsolr.secureComms=none -Dsolr.sharedSecret=alfresco-secret
-Dalfresco.host=${PROXY_HOST} -Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT} -Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL} -Dalfresco.protocol=${PROXY_PROTOCOL}
@ -41,7 +41,7 @@ services:
-Dcsrf.filter.enabled=false -Dcsrf.filter.enabled=false
-Dcors.enabled=false -Dcors.enabled=false
-Dtransform.service.enabled=false -Dtransform.service.enabled=false
-Dlocal.transform.service.enabled=false -Dlocal.transform.service.enabled=true
-Dsystem.content.eagerOrphanCleanup=true -Dsystem.content.eagerOrphanCleanup=true
-Dsystem.content.orphanProtectDays=0 -Dsystem.content.orphanProtectDays=0
-Djodconverter.enabled=false -Djodconverter.enabled=false
@ -51,8 +51,7 @@ services:
- activemq - activemq
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
postgres-acs: postgres-acs:
image: postgres:${POSTGRES_TAG} image: postgres:${POSTGRES_TAG}
@ -63,15 +62,15 @@ services:
command: postgres -c max_connections=300 -c log_min_messages=LOG command: postgres -c max_connections=300 -c log_min_messages=LOG
search: search:
image: alfresco/alfresco-search-services:2.0.1 image: alfresco/alfresco-search-services:${ASIE_TAG}
mem_limit: 1g
environment: environment:
- SOLR_ALFRESCO_HOST=platform SOLR_ALFRESCO_HOST: platform
- SOLR_ALFRESCO_PORT=8080 SOLR_SOLR_HOST: search
- SOLR_SOLR_HOST=search SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
- SOLR_SOLR_PORT=8983 ALFRESCO_SECURE_COMMS: secret
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive JAVA_TOOL_OPTIONS: "
- ALFRESCO_SECURE_COMMS=none -Dalfresco.secureComms.secret=alfresco-secret
"
activemq: activemq:
image: alfresco/alfresco-activemq:${AAMQ_TAG} image: alfresco/alfresco-activemq:${AAMQ_TAG}