Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
3 changes: 2 additions & 1 deletion eng/docker/build-docker-sdk.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ if ($buildWindowsContainers)

$dockerFile="$dockerFilePrefix.windows.Dockerfile"

docker build --tag $imageName `
docker build --pull `
--tag $imageName `
--build-arg CONFIGURATION=$configuration `
--build-arg TESTHOST_LOCATION=. `
--file $dockerFile `
Expand Down
3 changes: 2 additions & 1 deletion eng/docker/build-docker-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ if [[ $privateaspnetcore -eq 1 ]]; then
docker_file="$scriptroot/libraries-sdk-aspnetcore.linux.Dockerfile"
fi

docker build --tag $imagename \
docker build --pull \
--tag $imagename \
--build-arg CONFIGURATION=$configuration \
--file $docker_file \
$repo_root
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/stress/http.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
cd '$(httpStressProject)'
export CLIENT_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/client/3.0"
export SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/3.0"
export HTTPSTRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 3.0 -xops 10"
export HTTPSTRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 3.0"
export HTTPSTRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 3.0"
docker-compose up --abort-on-container-exit --no-color
displayName: Run HttpStress - HTTP 3.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ COPY . .
# Pulling the msquic Debian package from msquic-ci public pipeline and from a hardcoded build.
# Note that this is a temporary solution until we have properly published Linux packages.
# Also note that in order to update to a newer msquic build, you have update this link.
ARG MSQUIC_PACKAGE=libmsquic_1.8.0_amd64.deb
ARG PACKAGES_DIR=LinuxPackages
RUN wget 'https://dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_apis/build/builds/1352017/artifacts?artifactName=LinuxPackages&api-version=6.0&%24format=zip' -O "$PACKAGES_DIR".zip
ARG MSQUIC_PACKAGE=libmsquic_1.9.0_amd64.deb
ARG PACKAGES_DIR=UnsignedUnixPackages
RUN wget 'https://dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_apis/build/builds/1426627/artifacts?artifactName=UnsignedUnixPackages&api-version=6.0&%24format=zip' -O "$PACKAGES_DIR".zip
RUN apt-get update
RUN apt-get install unzip
RUN unzip $PACKAGES_DIR.zip
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@ if ($useWindowsContainers)
$originalErrorPreference = $ErrorActionPreference
$ErrorActionPreference = 'Continue'
try {
docker-compose --file "$COMPOSE_FILE" pull client
if ($LASTEXITCODE -ne 0) {
throw "docker-compose exited with error code $LASTEXITCODE"
}
docker-compose --file "$COMPOSE_FILE" pull server
if ($LASTEXITCODE -ne 0) {
throw "docker-compose exited with error code $LASTEXITCODE"
}

docker-compose --log-level DEBUG --file "$COMPOSE_FILE" build $BUILD_ARGS.Split() 2>&1 | ForEach-Object { "$_" }
if ($LASTEXITCODE -ne 0) {
throw "docker-compose exited with error code $LASTEXITCODE"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@ fi

compose_file="$scriptroot/docker-compose.yml"

if ! docker-compose --file "$compose_file" pull client; then
exit $?
fi
if ! docker-compose --file "$compose_file" pull server; then
exit $?
fi

if ! docker-compose --file "$compose_file" build $build_args; then
exit $?
fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@ if ($useWindowsContainers)
$originalErrorPreference = $ErrorActionPreference
$ErrorActionPreference = 'Continue'
try {
docker-compose --file "$COMPOSE_FILE" pull client
if ($LASTEXITCODE -ne 0) {
throw "docker-compose exited with error code $LASTEXITCODE"
}
docker-compose --file "$COMPOSE_FILE" pull server
if ($LASTEXITCODE -ne 0) {
throw "docker-compose exited with error code $LASTEXITCODE"
}

docker-compose --log-level DEBUG --file "$COMPOSE_FILE" build $BUILD_ARGS.Split() 2>&1 | ForEach-Object { "$_" }
if ($LASTEXITCODE -ne 0) {
throw "docker-compose exited with error code $LASTEXITCODE"
Expand Down