Skip to content

[NET] Fix docker compose. #126473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ManickaP wants to merge 1 commit into
base: release/10.0
Choose a base branch
from
+6 −6
Open

[NET] Fix docker compose. #126473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ if (!$noBuild) {
$originalErrorPreference = $ErrorActionPreference
$ErrorActionPreference = 'Continue'
try {
write-output "docker compose --file $COMPOSE_FILE build $buildArgs"
docker compose --file $COMPOSE_FILE build @buildArgs 2>&1
write-output "docker-compose --file $COMPOSE_FILE build $buildArgs"
docker-compose --file $COMPOSE_FILE build @buildArgs 2>&1
if ($LASTEXITCODE -ne 0) {
throw "docker compose exited with error code $LASTEXITCODE"
throw "docker-compose exited with error code $LASTEXITCODE"
}
}
finally {
Expand All @@ -86,5 +86,5 @@ if (!$buildOnly) {

$env:STRESS_CLIENT_ARGS = $clientStressArgs
$env:STRESS_SERVER_ARGS = $serverStressArgs
docker compose --file "$COMPOSE_FILE" up --abort-on-container-exit
docker-compose --file "$COMPOSE_FILE" up --abort-on-container-exit
}
4 changes: 2 additions & 2 deletions src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ if [[ "$nobuild" -eq 0 ]]; then
build_args="$build_args --build-arg SDK_BASE_IMAGE=$imagename"
fi

if ! docker-compose --file "$compose_file" build $build_args; then
if ! docker compose --file "$compose_file" build $build_args; then
exit $?
fi
fi
Expand All @@ -113,6 +113,6 @@ if [[ "$buildonly" -eq 0 ]]; then

export STRESS_CLIENT_ARGS=$clientstressargs
export STRESS_SERVER_ARGS=$serverstressargs
docker-compose --file "$compose_file" up --abort-on-container-exit
docker compose --file "$compose_file" up --abort-on-container-exit
exit $?
fi
Loading