From aee55d2ea774ade0103989c5c806a602e2a86cec Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 1 Oct 2024 15:59:48 +0200 Subject: [PATCH] Fix how Docker Compose is called --- .github/workflows/ci.yml | 5 ++--- run.sh | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c318fef..ce221ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,4 @@ --- - name: CI on: push: @@ -46,13 +45,13 @@ jobs: run: rustup self update && rustup update stable - name: Start the local environment - run: docker-compose up -d + run: docker compose up -d - name: Run the local release process for channel ${{ matrix.channel }} run: ./run.sh ${{ matrix.channel }} - name: Validate the generated signatures - run: docker-compose exec -T local /src/local/check-signature.sh ${{ matrix.channel }} + run: docker compose exec -T local /src/local/check-signature.sh ${{ matrix.channel }} - name: Remove the previously installed ${{ matrix.channel }} toolchain run: rustup toolchain remove ${{ matrix.channel }} diff --git a/run.sh b/run.sh index e2a66c0..60be624 100755 --- a/run.sh +++ b/run.sh @@ -12,7 +12,7 @@ fi channel="$1" override_commit="${2-}" -container_id="$(docker-compose ps -q local)" +container_id="$(docker compose ps -q local)" if [[ "${container_id}" == "" ]]; then container_status="missing" else @@ -22,7 +22,7 @@ if [[ "${container_status}" != "running" ]]; then echo "Error: the local environment is not running!" echo "You can start it by running in a new terminal the following command:" echo - echo " docker-compose up" + echo " docker compose up" echo exit 1 fi @@ -31,4 +31,4 @@ fi cargo build --release # Run the command inside the docker environment. -docker-compose exec -T local /src/local/run.sh "${channel}" "${override_commit}" +docker compose exec -T local /src/local/run.sh "${channel}" "${override_commit}"