From 5a6f9a60f3ed17e8260cbd4f2d2d15abc1dfdc49 Mon Sep 17 00:00:00 2001 From: Kacper Magdziarz <95610011+kmagdziarz@users.noreply.github.com> Date: Thu, 21 Apr 2022 18:47:50 +0200 Subject: [PATCH] ACS-2768 Fix of Automate update of t-router and t-engine references in repositories (#1081) --- amps/ags/rm-community/rm-community-repo/.env | 1 - packaging/tests/environment/.env | 1 - packaging/tests/scripts/start-compose.sh | 5 ++++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env index 4f9d9b9b66..ca3c68b5dc 100644 --- a/amps/ags/rm-community/rm-community-repo/.env +++ b/amps/ags/rm-community/rm-community-repo/.env @@ -1,4 +1,3 @@ -TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout) SOLR6_TAG=2.0.3 POSTGRES_TAG=13.3 ACTIVEMQ_TAG=5.16.1 diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env index 4f9d9b9b66..ca3c68b5dc 100644 --- a/packaging/tests/environment/.env +++ b/packaging/tests/environment/.env @@ -1,4 +1,3 @@ -TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout) SOLR6_TAG=2.0.3 POSTGRES_TAG=13.3 ACTIVEMQ_TAG=5.16.1 diff --git a/packaging/tests/scripts/start-compose.sh b/packaging/tests/scripts/start-compose.sh index 96c5cacf20..9e364dfe78 100755 --- a/packaging/tests/scripts/start-compose.sh +++ b/packaging/tests/scripts/start-compose.sh @@ -27,8 +27,11 @@ fi echo "Starting ACS stack in ${DOCKER_COMPOSE_PATH}" +TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout) +TRANSFORM_ROUTER_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-service.version -q -DforceStdout) + # .env files are picked up from project directory correctly on docker-compose 1.23.0+ -docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d +TRANSFORMERS_TAG=${TRANSFORMERS_TAG} TRANSFORM_ROUTER_TAG=${TRANSFORM_ROUTER_TAG} docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d if [ $? -eq 0 ] then