From 1313412de9fb4e3ef2246f51d93e4442b959ca3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20W=C3=B6rpel?= Date: Tue, 12 Nov 2024 17:10:56 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20Upgrade=20to=20newer=20compose?= =?UTF-8?q?=20binary=20syntax?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/e2e.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 8494cb5ac2..e7bea7e1c7 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -28,7 +28,7 @@ jobs: sudo echo "ALEPH_SECRET_KEY=batman\n" >> aleph.env echo "${GITHUB_REF}" docker --version - docker-compose --version + docker compose --version - name: Build e2e image run: make build-e2e diff --git a/Makefile b/Makefile index 8e279d69d8..52bf8c1af1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -COMPOSE=docker-compose -f docker-compose.dev.yml -COMPOSE_E2E=docker-compose -f docker-compose.dev.yml -f docker-compose.e2e.yml +COMPOSE=docker compose -f docker-compose.dev.yml +COMPOSE_E2E=docker compose -f docker-compose.dev.yml -f docker-compose.e2e.yml APPDOCKER=$(COMPOSE) run --rm app UIDOCKER=$(COMPOSE) run --no-deps --rm ui ALEPH_TAG=latest