From ca891f1b8ecd9a4b39cd227ddd3681d05f8cf203 Mon Sep 17 00:00:00 2001 From: petarbasic <52317999+petarbasic@users.noreply.github.com> Date: Tue, 28 Feb 2023 12:09:50 +0100 Subject: [PATCH] INF-474: Adjust to using docker-compose v2 on CI. (#63) --- .github/workflows/test-drupal-setup.yml | 2 +- scripts/util/exec.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-drupal-setup.yml b/.github/workflows/test-drupal-setup.yml index 6a5b52c2aa..34ce83f289 100644 --- a/.github/workflows/test-drupal-setup.yml +++ b/.github/workflows/test-drupal-setup.yml @@ -31,7 +31,7 @@ jobs: run: | DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker} mkdir -p $DOCKER_CONFIG/cli-plugins - curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o $DOCKER_CONFIG/cli-plugins/docker-compose + curl -SL https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64 -o $DOCKER_CONFIG/cli-plugins/docker-compose chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose docker-compose version - name: Install composer dependencies. diff --git a/scripts/util/exec.sh b/scripts/util/exec.sh index 68c53e41f0..10c69024d8 100755 --- a/scripts/util/exec.sh +++ b/scripts/util/exec.sh @@ -42,7 +42,7 @@ fi if [[ "$PHAPP_ENV" = "drunomics-ci" ]]; then CONTAINER=${APP_MULTISITE_DOMAIN/\.ci\.drunomics\.com/} elif [[ "$PHAPP_ENV_TYPE" = "lagoon" ]]; then - CONTAINER=${COMPOSE_PROJECT_NAME}_cli_1 + CONTAINER=${COMPOSE_PROJECT_NAME}-cli-1 elif [[ "$PHAPP_ENV" = "vagrant" ]]; then CONTAINER=${APP_MULTISITE_DOMAIN/\.local/} elif [[ "$PHAPP_ENV" = "travis" ]]; then