Merge branch 'acs-base' into acs

This commit is contained in:
Brian Long 2022-11-01 14:52:59 -04:00
commit 173de2375e
2 changed files with 8 additions and 8 deletions

4
.env
View File

@ -4,3 +4,7 @@ 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.3.0
AAMQ_TAG=5.17.1-jre17-centos7
POSTGRES_TAG=13

View File

@ -1,12 +1,10 @@
# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml # 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:7.3.0 image: alfresco/alfresco-content-repository-community:${ACS_TAG}
mem_limit: 1700m
environment: environment:
JAVA_TOOL_OPTIONS: " JAVA_TOOL_OPTIONS: "
-Dencryption.keystore.type=JCEKS -Dencryption.keystore.type=JCEKS
@ -44,8 +42,7 @@ services:
- activemq - activemq
postgres-acs: postgres-acs:
image: postgres:13 image: postgres:${POSTGRES_TAG}
mem_limit: 128m
environment: environment:
- POSTGRES_PASSWORD=alfresco - POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco - POSTGRES_USER=alfresco
@ -53,8 +50,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.17.1-jre17-centos7 image: alfresco/alfresco-activemq:${AAMQ_TAG}
mem_limit: 512m
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress