Skip to content

Commit ca891f1

Browse files
authored
INF-474: Adjust to using docker-compose v2 on CI. (#63)
1 parent 5b728fb commit ca891f1

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/test-drupal-setup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: |
3232
DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
3333
mkdir -p $DOCKER_CONFIG/cli-plugins
34-
curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o $DOCKER_CONFIG/cli-plugins/docker-compose
34+
curl -SL https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64 -o $DOCKER_CONFIG/cli-plugins/docker-compose
3535
chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
3636
docker-compose version
3737
- name: Install composer dependencies.

scripts/util/exec.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fi
4242
if [[ "$PHAPP_ENV" = "drunomics-ci" ]]; then
4343
CONTAINER=${APP_MULTISITE_DOMAIN/\.ci\.drunomics\.com/}
4444
elif [[ "$PHAPP_ENV_TYPE" = "lagoon" ]]; then
45-
CONTAINER=${COMPOSE_PROJECT_NAME}_cli_1
45+
CONTAINER=${COMPOSE_PROJECT_NAME}-cli-1
4646
elif [[ "$PHAPP_ENV" = "vagrant" ]]; then
4747
CONTAINER=${APP_MULTISITE_DOMAIN/\.local/}
4848
elif [[ "$PHAPP_ENV" = "travis" ]]; then

0 commit comments

Comments
 (0)