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
ACS_TAG=7.3.0
ATE_AIO_TAG=3.0.0
AAMQ_TAG=5.17.1-jre17-centos7
POSTGRES_TAG=13
ASIE_TAG=2.0.5

View File

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