INF-474: Adjust to using docker-compose v2 on CI. (#63)

drunomics · Feb 28, 2023 · ca891f1 · ca891f1
1 parent 5b728fb
commit ca891f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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