diff --git a/.travis.yml b/.travis.yml index 6b7c3c60ca..23b4ef7dac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,7 @@ jobs: if [[ ${TRAVIS_BRANCH} == *community* ]]; then bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH else - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + bash scripts/start-compose.sh "${ENTERPRISE_REPO_PATH}/docker-compose-travis.yml" fi - bash scripts/waitForAlfrescoToStart.sh script: mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false @@ -94,7 +94,7 @@ jobs: - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-enterprise-rest-api -am before_script: - - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + - bash scripts/start-compose.sh "${ENTERPRISE_REPO_PATH}/docker-compose-travis.yml" - bash scripts/waitForAlfrescoToStart.sh script: - mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false diff --git a/scripts/start-compose.sh b/scripts/start-compose.sh new file mode 100644 index 0000000000..5de2330d74 --- /dev/null +++ b/scripts/start-compose.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +export DOCKER_COMPOSE_PATH="${1}" + +if [ -z "$DOCKER_COMPOSE_PATH" ] ; then + echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\"" + exit 1 +fi + +echo "Starting AGS stack in ${DOCKER_COMPOSE_PATH}" + +# .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 + +if [ $? -eq 0 ] ; then + echo "Docker Compose started ok" +else + echo "Docker Compose failed to start" >&2 + exit 1 +fi