Merge branch 'acs-frontend-persist' into acs-mysql-frontend-persist

This commit is contained in:
Brian Long 2023-10-25 22:20:29 -04:00
commit 7fec1a55ac
2 changed files with 43 additions and 24 deletions

7
.env
View File

@ -4,3 +4,10 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
PROXY_PROTOCOL=http PROXY_PROTOCOL=http
PROXY_HOST=localhost PROXY_HOST=localhost
PROXY_PORT=8080 PROXY_PORT=8080
ACS_TAG=7.4.1.1
ATE_AIO_TAG=4.0.0
AAMQ_TAG=latest
POSTGRES_TAG=13
ASIE_TAG=2.0.8.2
ACS_SHARE_TAG=7.4.1.2

View File

@ -1,22 +1,32 @@
# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml # Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
# #
# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose version: "3"
version: "2"
services: services:
platform: platform:
image: alfresco/alfresco-content-repository-community:6.2.0-ga image: alfresco/alfresco-content-repository-community:${ACS_TAG}
mem_limit: 1700m
environment: environment:
JAVA_TOOL_OPTIONS: "
-Dencryption.keystore.type=JCEKS
-Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-Dencryption.keyAlgorithm=DESede
-Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-Dmetadata-keystore.password=mp6yc0UD9e
-Dmetadata-keystore.aliases=metadata
-Dmetadata-keystore.metadata.password=oKIWzVdEdA
-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
-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=solr6 -Dindex.subsystem.name=solr6
-Dsolr.host=search -Dsolr.host=search
-Dsolr.port=8983 -Dsolr.secureComms=secret
-Dsolr.secureComms=none -Dsolr.sharedSecret=alfresco-secret
-Dshare.host=${PROXY_HOST} -Dshare.host=${PROXY_HOST}
-Dshare.port=${PROXY_PORT} -Dshare.port=${PROXY_PORT}
-Dshare.protocol=${PROXY_PROTOCOL} -Dshare.protocol=${PROXY_PROTOCOL}
@ -33,10 +43,9 @@ services:
-Dtika.url=http://transform-core-aio:8090/ -Dtika.url=http://transform-core-aio:8090/
-Dtransform.misc.url=http://transform-core-aio:8090/ -Dtransform.misc.url=http://transform-core-aio:8090/
-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=true
-Dsystem.content.eagerOrphanCleanup=true -Dsystem.content.eagerOrphanCleanup=true
-Dsystem.content.orphanProtectDays=0 -Dsystem.content.orphanProtectDays=0
-Djodconverter.enabled=false -Djodconverter.enabled=false
@ -49,12 +58,10 @@ services:
- /usr/share/java/mysql.jar:/usr/local/tomcat/lib/mysql.jar:ro - /usr/share/java/mysql.jar:/usr/local/tomcat/lib/mysql.jar:ro
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
share: share:
image: alfresco/alfresco-share:6.2.2 image: alfresco/alfresco-share:${ACS_SHARE_TAG}
mem_limit: 512m
environment: environment:
REPO_HOST: "platform" REPO_HOST: "platform"
CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*" CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
@ -80,21 +87,26 @@ services:
- acsdb-volume:/var/lib/mysql:rw - acsdb-volume:/var/lib/mysql:rw
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
"
healthcheck:
test: "curl -fsS http://localhost:8983/solr"
volumes: volumes:
- solrindex-volume:/opt/alfresco-search-services/data:rw - solrindex-volume:/opt/alfresco-search-services/data:rw
activemq: activemq:
image: alfresco/alfresco-activemq:5.15.8 image: alfresco/alfresco-activemq:${AAMQ_TAG}
mem_limit: 512m environment:
ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
ACTIVEMQ_ADMIN_LOGIN: alfresco
ACTIVEMQ_ADMIN_PASSWORD: alfresco
volumes: volumes:
- activemq-volume:/opt/activemq/data:rw - activemq-volume:/opt/activemq/data:rw