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 f569d712e1b1ddf730f768c9f57e38ea74f49108 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 1 Nov 2022 15:30:07 -0400 Subject: [PATCH 2/2] parameterize Docker image versions --- .env | 5 +++++ docker-compose.yml | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.env b/.env index e69de29..d126a74 100644 --- a/.env +++ b/.env @@ -0,0 +1,5 @@ + +ATR_TAG=2.0.0 +ATE_AIO_TAG=3.0.0 +ASFS_TAG=2.0.0 +AAMQ_TAG=5.17.1-jre17-centos7 diff --git a/docker-compose.yml b/docker-compose.yml index a52d483..b3f8e48 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: transform-router: - image: quay.io/alfresco/alfresco-transform-router:latest + image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG} environment: ACTIVEMQ_URL: "nio://activemq:61616" CORE_AIO_URL : "http://transform-core-aio:8090" @@ -14,7 +14,7 @@ services: - shared-file-store transform-core-aio: - image: alfresco/alfresco-transform-core-aio:latest + image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG} environment: ACTIVEMQ_URL: "nio://activemq:61616" FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" @@ -23,12 +23,12 @@ services: - shared-file-store shared-file-store: - image: alfresco/alfresco-shared-file-store:latest + image: alfresco/alfresco-shared-file-store:${ASFS_TAG} volumes: - shared-file-store-volume:/tmp/Alfresco/sfs activemq: - image: alfresco/alfresco-activemq:latest + image: alfresco/alfresco-activemq:${AAMQ_TAG} volumes: shared-file-store-volume: