Merge branch 'acs-base' into acs

This commit is contained in:
Brian Long 2022-11-01 14:22:57 -04:00
commit 481e1bb38d

View File

@ -5,9 +5,18 @@ version: "2"
services: services:
platform: platform:
image: alfresco/alfresco-content-repository-community:6.2.0-ga image: alfresco/alfresco-content-repository-community:7.3.0
mem_limit: 1700m 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: "
-Ddb.driver=org.postgresql.Driver -Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco -Ddb.username=alfresco
@ -35,7 +44,7 @@ services:
- activemq - activemq
postgres-acs: postgres-acs:
image: postgres:11.7 image: postgres:13
mem_limit: 128m mem_limit: 128m
environment: environment:
- POSTGRES_PASSWORD=alfresco - POSTGRES_PASSWORD=alfresco
@ -44,7 +53,7 @@ services:
command: postgres -c max_connections=300 -c log_min_messages=LOG command: postgres -c max_connections=300 -c log_min_messages=LOG
activemq: activemq:
image: alfresco/alfresco-activemq:5.15.8 image: alfresco/alfresco-activemq:5.17.1-jre17-centos7
mem_limit: 512m mem_limit: 512m
proxy: proxy: