From 9f839b5372af83e6c3a384a0da6c0998d10ddfb0 Mon Sep 17 00:00:00 2001 From: Kacper Magdziarz <95610011+kmagdziarz@users.noreply.github.com> Date: Tue, 8 Nov 2022 12:05:15 +0100 Subject: [PATCH] Feature/acs-3644 Allow multiple docker-copose files (#1533) * ACS-3644 enable usage of multiple docker-compose files in start-compose.sh --- packaging/tests/scripts/start-compose.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/packaging/tests/scripts/start-compose.sh b/packaging/tests/scripts/start-compose.sh index 4cc30b7429..e462205865 100755 --- a/packaging/tests/scripts/start-compose.sh +++ b/packaging/tests/scripts/start-compose.sh @@ -1,9 +1,21 @@ #!/usr/bin/env bash +set -x export DOCKER_COMPOSE_PATH=$1 -export CLEAN_UP="$2" +export DOCKER_COMPOSES="" +export CLEAN_UP="" -if [ -z "$DOCKER_COMPOSE_PATH" ] +for var in "$@" +do + if [ "$var" == "no-clean-up" ] + then + export CLEAN_UP="$var" + else + export DOCKER_COMPOSES+="--file $var " + fi +done + +if [ -z "$DOCKER_COMPOSES" ] then echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\"" exit 1 @@ -15,8 +27,8 @@ fi # The second parameter can be used to avoid doing a clean up if we are doing a restart test. if [ "$CLEAN_UP" != "no-clean-up" ] then - docker-compose --file "${DOCKER_COMPOSE_PATH}" kill - docker-compose --file "${DOCKER_COMPOSE_PATH}" rm -f + docker-compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") kill + docker-compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") rm -f export GENERATED_IMAGES=$(docker images | grep '^environment_' | awk '{ print $3 }') if [ -n "$GENERATED_IMAGES" ] @@ -31,7 +43,7 @@ export TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-tra export 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 +docker-compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d if [ $? -eq 0 ] then