Skip to content

Commit aee55d2

Browse files
committed
Fix how Docker Compose is called
1 parent 39152f3 commit aee55d2

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
32
name: CI
43
on:
54
push:
@@ -46,13 +45,13 @@ jobs:
4645
run: rustup self update && rustup update stable
4746

4847
- name: Start the local environment
49-
run: docker-compose up -d
48+
run: docker compose up -d
5049

5150
- name: Run the local release process for channel ${{ matrix.channel }}
5251
run: ./run.sh ${{ matrix.channel }}
5352

5453
- name: Validate the generated signatures
55-
run: docker-compose exec -T local /src/local/check-signature.sh ${{ matrix.channel }}
54+
run: docker compose exec -T local /src/local/check-signature.sh ${{ matrix.channel }}
5655

5756
- name: Remove the previously installed ${{ matrix.channel }} toolchain
5857
run: rustup toolchain remove ${{ matrix.channel }}

run.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fi
1212
channel="$1"
1313
override_commit="${2-}"
1414

15-
container_id="$(docker-compose ps -q local)"
15+
container_id="$(docker compose ps -q local)"
1616
if [[ "${container_id}" == "" ]]; then
1717
container_status="missing"
1818
else
@@ -22,7 +22,7 @@ if [[ "${container_status}" != "running" ]]; then
2222
echo "Error: the local environment is not running!"
2323
echo "You can start it by running in a new terminal the following command:"
2424
echo
25-
echo " docker-compose up"
25+
echo " docker compose up"
2626
echo
2727
exit 1
2828
fi
@@ -31,4 +31,4 @@ fi
3131
cargo build --release
3232

3333
# Run the command inside the docker environment.
34-
docker-compose exec -T local /src/local/run.sh "${channel}" "${override_commit}"
34+
docker compose exec -T local /src/local/run.sh "${channel}" "${override_commit}"

0 commit comments

Comments
 (0)