Skip to content

Commit 88405d6

Browse files
authored
Upgrade CI to use docker-compose v2 (#3543)
## Motivation and Context - actions/runner-images#9557 - https://docs.docker.com/compose/migrate/ ## Description It seems like they should be drop-in compatible for our use case. ---- _By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice._
1 parent 31e7b1a commit 88405d6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if [[ $# -lt 1 ]]; then
1010
echo "Usage: ci <action> [args...]"
1111
echo
1212
echo "Runs a CI action from tools/ci-build/scripts within the Docker build image."
13-
echo "Requires Docker and docker-compose to both be installed."
13+
echo "Requires Docker and docker compose to both be installed."
1414
echo
1515
echo "Note: Some actions may require 'aws-sdk-rust' and/or 'aws-doc-sdk-examples'"
1616
echo "to be checked out in the same directory as 'smithy-rs'."

tools/ci-build/ci-action

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ACTION_PATH="$("${SCRIPT_PATH}"/ci-create-workspace)"
3333
cd "${SCRIPT_PATH}"
3434

3535
function cleanup {
36-
docker-compose -f build.docker-compose.yml down
36+
docker compose -f build.docker-compose.yml down
3737
cd "${START_PATH}"
3838
mv "${ACTION_PATH}/workspace/artifacts" .
3939
if [[ -d "${ACTION_PATH}/workspace/smithy-rs/target" ]]; then
@@ -51,10 +51,10 @@ GROUP_ID="$(id -g)"
5151
export USER_ID
5252
export GROUP_ID
5353
export GRADLE_CACHE_PATH="${START_PATH}/gradle"
54-
docker-compose -f build.docker-compose.yml up -d
54+
docker compose -f build.docker-compose.yml up -d
5555
if [[ "${ACTION_NAME}" == "--shell" ]]; then
56-
docker-compose -f build.docker-compose.yml exec smithy-rs-build /bin/bash
56+
docker compose -f build.docker-compose.yml exec smithy-rs-build /bin/bash
5757
else
58-
docker-compose -f build.docker-compose.yml exec -T smithy-rs-build bash -c "cd workspace; ./ci-scripts/${ACTION_NAME} ${ACTION_ARGS[*]}"
58+
docker compose -f build.docker-compose.yml exec -T smithy-rs-build bash -c "cd workspace; ./ci-scripts/${ACTION_NAME} ${ACTION_ARGS[*]}"
5959
fi
6060
exit $?

0 commit comments

Comments
 (0)