From 10e7f81163fcb9e0d780685267f31e4f9ebf9f07 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 1 Nov 2022 14:46:58 -0400 Subject: [PATCH 1/2] advancing to docker v3 --- docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f70207f..2668565 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ # 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: "2" - +version: "3" From 8e3301877ad72135bd2d580c85a8f2f02fcc1308 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 1 Nov 2022 14:51:11 -0400 Subject: [PATCH 2/2] parameterized docker image tags --- .env | 4 ++++ docker-compose.yml | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 171f8c4..43cc336 100644 --- a/.env +++ b/.env @@ -4,3 +4,7 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license PROXY_PROTOCOL=http PROXY_HOST=localhost PROXY_PORT=8080 + +ACS_TAG=7.3.0 +AAMQ_TAG=5.17.1-jre17-centos7 +POSTGRES_TAG=13 diff --git a/docker-compose.yml b/docker-compose.yml index 9991a22..1e6053e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: platform: - image: alfresco/alfresco-content-repository-community:7.3.0 + image: alfresco/alfresco-content-repository-community:${ACS_TAG} environment: JAVA_TOOL_OPTIONS: " -Dencryption.keystore.type=JCEKS @@ -28,10 +28,10 @@ services: - activemq postgres-acs: - image: postgres:13 + image: postgres:${POSTGRES_TAG} activemq: - image: alfresco/alfresco-activemq:5.17.1-jre17-centos7 + image: alfresco/alfresco-activemq:${AAMQ_TAG} proxy: build: ./nginx-ingress