From 5b5fa179e4412b48114d0f604b310a0c5f5026b5 Mon Sep 17 00:00:00 2001
From: Radek Zikmund <r.zikmund.rz@gmail.com>
Date: Wed, 9 Oct 2024 12:09:41 +0200
Subject: [PATCH 01/10] Add -nobuild option

---
 .../Net/StressTests/run-docker-compose.ps1    | 39 ++++++++++---------
 .../Net/StressTests/run-docker-compose.sh     | 21 ++++++----
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1 b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
index 6e5526e5768d1a..4eee9986c0e843 100644
--- a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
+++ b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
@@ -9,6 +9,7 @@ Param(
     [switch][Alias('b')]$buildCurrentLibraries, # Drives the stress test using libraries built from current source
     [switch][Alias('pa')]$privateAspNetCore, # Drive the stress test using a private Asp.Net Core package, requires -b to be set
     [switch][Alias('o')]$buildOnly, # Build, but do not run the stress app
+    [switch][Alias('n')]$noBuild, # Do not build the docker image
     [string][Alias('t')]$sdkImageName = "dotnet-sdk-libs-current", # Name of the sdk image name, if built from source.
     [string]$clientStressArgs = "",
     [string]$serverStressArgs = "",
@@ -55,29 +56,31 @@ elseif ($privateAspNetCore) {
     exit 1
 }
 
-# Dockerize the stress app using docker-compose
-$BuildArgs = @(
-    "--build-arg", "VERSION=$Version",
-    "--build-arg", "CONFIGURATION=$configuration"
-)
-if (![string]::IsNullOrEmpty($sdkImageName)) {
-    $BuildArgs += "--build-arg", "SDK_BASE_IMAGE=$sdkImageName"
-}
 if ($useWindowsContainers) {
     $env:DOCKERFILE = "windows.Dockerfile"
 }
 
-$originalErrorPreference = $ErrorActionPreference
-$ErrorActionPreference = 'Continue'
-try {
-    write-output "$dockerComposeCmd --log-level DEBUG --file $COMPOSE_FILE build $buildArgs"
-    & $dockerComposeCmd --log-level DEBUG --file $COMPOSE_FILE build @buildArgs 2>&1 | ForEach-Object { "$_" }
-    if ($LASTEXITCODE -ne 0) {
-        throw "docker-compose exited with error code $LASTEXITCODE"
+if (!$noBuild) {
+    # Dockerize the stress app using docker-compose
+    $BuildArgs = @(
+        "--build-arg", "VERSION=$Version",
+        "--build-arg", "CONFIGURATION=$configuration"
+    )
+    if (![string]::IsNullOrEmpty($sdkImageName)) {
+        $BuildArgs += "--build-arg", "SDK_BASE_IMAGE=$sdkImageName"
+    }
+    $originalErrorPreference = $ErrorActionPreference
+    $ErrorActionPreference = 'Continue'
+    try {
+        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"
+        }
+    }
+    finally {
+        $ErrorActionPreference = $originalErrorPreference
     }
-}
-finally {
-    $ErrorActionPreference = $originalErrorPreference
 }
 
 # Run the stress app
diff --git a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
index 3b659c740ba4dd..2b5a94ba2ac17d 100755
--- a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
+++ b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
@@ -28,6 +28,7 @@ imagename="dotnet-sdk-libs-current"
 configuration="Release"
 buildcurrentlibraries=0
 buildonly=0
+nobuild=0
 clientstressargs=""
 serverstressargs=""
 
@@ -62,6 +63,10 @@ while [[ $# > 0 ]]; do
       buildonly=1
       shift 1
       ;;
+    -nobuild|-n)
+      nobuild=1
+      shift 1
+      ;;
     -clientstressargs)
       clientstressargs=$2
       shift 2
@@ -86,15 +91,17 @@ if [[ "$buildcurrentlibraries" -eq 1 ]]; then
     fi
 fi
 
-build_args="--build-arg VERSION=$version --build-arg CONFIGURATION=$configuration"
-if [[ -n "$imagename" ]]; then
-    build_args="$build_args --build-arg SDK_BASE_IMAGE=$imagename"
-fi
-
 compose_file="$projectdir/docker-compose.yml"
 
-if ! docker-compose --file "$compose_file" build $build_args; then
-    exit $?
+if [[ "$nobuild" -eq 0 ]]; then
+    build_args="--build-arg VERSION=$version --build-arg CONFIGURATION=$configuration"
+    if [[ -n "$imagename" ]]; then
+        build_args="$build_args --build-arg SDK_BASE_IMAGE=$imagename"
+    fi
+
+    if ! docker-compose --file "$compose_file" build $build_args; then
+        exit $?
+    fi
 fi
 
 if [[ "$buildonly" -eq 0 ]]; then

From b52c7e16ff08e9ea9e122c2eb5ad1f8014970374 Mon Sep 17 00:00:00 2001
From: Radek Zikmund <r.zikmund.rz@gmail.com>
Date: Wed, 9 Oct 2024 12:14:35 +0200
Subject: [PATCH 02/10] replace docker-compose with docker compose

---
 eng/pipelines/libraries/stress/http.yml        | 18 ++++++------------
 eng/pipelines/libraries/stress/ssl.yml         |  9 ++-------
 .../Net/StressTests/run-docker-compose.ps1     | 13 +++----------
 .../Net/StressTests/run-docker-compose.sh      |  4 ++--
 4 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml
index 5ba255fb1b6fa4..314e0eddee6e38 100644
--- a/eng/pipelines/libraries/stress/http.yml
+++ b/eng/pipelines/libraries/stress/http.yml
@@ -62,7 +62,7 @@ extends:
             export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 3.0"
             export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 3.0"
             mkdir -p $DUMPS_SHARE
-            docker-compose up --abort-on-container-exit --no-color
+            docker compose up --abort-on-container-exit --no-color
           timeoutInMinutes: 35 # In case the HTTP/3.0 run hangs, we timeout shortly after the expected 30 minute run
           displayName: Run HttpStress - HTTP 3.0
           condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
@@ -72,7 +72,7 @@ extends:
             export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 2.0"
             export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 2.0"
             mkdir -p $DUMPS_SHARE
-            docker-compose up --abort-on-container-exit --no-color
+            docker compose up --abort-on-container-exit --no-color
           displayName: Run HttpStress - HTTP 2.0
           condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
 
@@ -81,7 +81,7 @@ extends:
             export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 1.1"
             export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 1.1"
             mkdir -p $DUMPS_SHARE
-            docker-compose up --abort-on-container-exit --no-color
+            docker compose up --abort-on-container-exit --no-color
           displayName: Run HttpStress - HTTP 1.1
           condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
 
@@ -100,12 +100,6 @@ extends:
         variables:
           DUMPS_SHARE_MOUNT_ROOT: "C:/dumps-share"
           DUMPS_SHARE: "$(Build.ArtifactStagingDirectory)/dumps/"
-
-          # The 1es-windows-2022-open image has an issue where the Chocolatey-installed V1 docker-compose takes precendence over the
-          # V2 docker-compose required by the stress tests, see: https://github.com/actions/runner-images/issues/7080
-          # This is worked around by handpicking the V2 executable.
-          # The workaround should be removed when the official fix is propagated into 1es-windows-2022-open, or when we switch to another image.
-          DOCKER_COMPOSE_CMD: "C:/ProgramData/docker/cli-plugins/docker-compose.exe"
         pool:
           name: $(DncEngPublicBuildPool)
           demands: ImageOverride -equals 1es-windows-2022-open
@@ -143,7 +137,7 @@ extends:
             $env:STRESS_CLIENT_ARGS = "$env:HTTPSTRESS_CLIENT_ARGS -http 3.0"
             $env:STRESS_SERVER_ARGS = "$env:HTTPSTRESS_SERVER_ARGS -http 3.0"
             New-Item -Force $env:DUMPS_SHARE -ItemType Directory
-            & $env:DOCKER_COMPOSE_CMD up --abort-on-container-exit --no-color
+            docker compose up --abort-on-container-exit --no-color
           displayName: Run HttpStress - HTTP 3.0
           condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
 
@@ -152,7 +146,7 @@ extends:
             $env:STRESS_CLIENT_ARGS = "$env:HTTPSTRESS_CLIENT_ARGS -http 2.0"
             $env:STRESS_SERVER_ARGS = "$env:HTTPSTRESS_SERVER_ARGS -http 2.0"
             New-Item -Force $env:DUMPS_SHARE -ItemType Directory
-            & $env:DOCKER_COMPOSE_CMD up --abort-on-container-exit --no-color
+            docker compose up --abort-on-container-exit --no-color
           displayName: Run HttpStress - HTTP 2.0
           condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
 
@@ -161,7 +155,7 @@ extends:
             $env:STRESS_CLIENT_ARGS = "$env:HTTPSTRESS_CLIENT_ARGS -http 1.1"
             $env:STRESS_SERVER_ARGS = "$env:HTTPSTRESS_SERVER_ARGS -http 1.1"
             New-Item -Force $env:DUMPS_SHARE -ItemType Directory
-            & $env:DOCKER_COMPOSE_CMD up --abort-on-container-exit --no-color
+            docker compose up --abort-on-container-exit --no-color
           displayName: Run HttpStress - HTTP 1.1
           condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
 
diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml
index f0f83bd1598e26..7593bfd64ea6b3 100644
--- a/eng/pipelines/libraries/stress/ssl.yml
+++ b/eng/pipelines/libraries/stress/ssl.yml
@@ -59,7 +59,7 @@ extends:
             export STRESS_CLIENT_ARGS=$SSLSTRESS_CLIENT_ARGS
             export STRESS_SERVER_ARGS=$SSLSTRESS_SERVER_ARGS
             mkdir -p $DUMPS_SHARE
-            docker-compose up --abort-on-container-exit --no-color
+            docker compose up --abort-on-container-exit --no-color
           displayName: Run SslStress
 
         - publish: $(Build.ArtifactStagingDirectory)/dumps
@@ -75,11 +75,6 @@ extends:
         variables:
           DUMPS_SHARE_MOUNT_ROOT: "C:/dumps-share"
           DUMPS_SHARE: "$(Build.ArtifactStagingDirectory)/dumps/"
-          # The 1es-windows-2022-open image has an issue where the Chocolatey-installed V1 docker-compose takes precendence over the
-          # V2 docker-compose required by the stress tests, see: https://github.com/actions/runner-images/issues/7080
-          # This is worked around by handpicking the V2 executable.
-          # The workaround should be removed when the official fix is propagated into 1es-windows-2022-open, or when we switch to another image.
-          DOCKER_COMPOSE_CMD: "C:/ProgramData/docker/cli-plugins/docker-compose.exe"
         steps:
         - checkout: self
           clean: true
@@ -102,7 +97,7 @@ extends:
             $env:STRESS_CLIENT_ARGS = $env:SSLSTRESS_CLIENT_ARGS
             $env:STRESS_SERVER_ARGS = $env:SSLSTRESS_SERVER_ARGS
             New-Item -Force $env:DUMPS_SHARE -ItemType Directory
-            & $env:DOCKER_COMPOSE_CMD up --abort-on-container-exit --no-color
+            docker compose up --abort-on-container-exit --no-color
           displayName: Run SslStress
 
         - publish: $(Build.ArtifactStagingDirectory)/dumps
diff --git a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1 b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
index 4eee9986c0e843..aeafbf4998ca96 100644
--- a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
+++ b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
@@ -21,13 +21,6 @@ $COMPOSE_FILE = "$TestProjectDir/docker-compose.yml"
 [xml]$xml = Get-Content (Join-Path $RepoRoot "eng\Versions.props")
 $VERSION = "$($xml.Project.PropertyGroup.MajorVersion[0]).$($xml.Project.PropertyGroup.MinorVersion[0])"
 
-# This is a workaround for an issue with 1es-windows-2022-open, which should be eventually removed.
-# See comments in <repo>/eng/pipelines/libraries/stress/ssl.yml for more info.
-$dockerComposeCmd = $env:DOCKER_COMPOSE_CMD
-if (!(Test-Path $dockerComposeCmd -ErrorAction SilentlyContinue)) {
-    $dockerComposeCmd = "docker-compose"
-}
-
 if (!$dumpsSharePath) {
     $dumpsSharePath = "$TestProjectDir/dumps"
 }
@@ -72,10 +65,10 @@ if (!$noBuild) {
     $originalErrorPreference = $ErrorActionPreference
     $ErrorActionPreference = 'Continue'
     try {
-        write-output "docker-compose --file $COMPOSE_FILE build $buildArgs"
+        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 {
@@ -99,5 +92,5 @@ if (!$buildOnly) {
 
     $env:STRESS_CLIENT_ARGS = $clientStressArgs
     $env:STRESS_SERVER_ARGS = $serverStressArgs
-    & $dockerComposeCmd --file "$COMPOSE_FILE" up --abort-on-container-exit
+    docker compose --file "$COMPOSE_FILE" up --abort-on-container-exit
 }
diff --git a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
index 2b5a94ba2ac17d..4997977244b012 100755
--- a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
+++ b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
@@ -99,7 +99,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
@@ -112,6 +112,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

From 601b5bd2d46913003a1f44a61366f0a0711def2b Mon Sep 17 00:00:00 2001
From: Radek Zikmund <r.zikmund.rz@gmail.com>
Date: Wed, 9 Oct 2024 12:38:37 +0200
Subject: [PATCH 03/10] remove unnecessary script parts

---
 .../Net/StressTests/run-docker-compose.ps1    | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1 b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
index aeafbf4998ca96..3159d641728588 100644
--- a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
+++ b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
@@ -27,10 +27,6 @@ if (!$dumpsSharePath) {
 
 # Build runtime libraries and place in a docker image
 if ($buildCurrentLibraries) {
-    if ([string]::IsNullOrEmpty($sdkImageName)) {
-        $sdkImageName = "dotnet-sdk-libs-current"
-    }
-
     $LIBRARIES_BUILD_ARGS = " -t $sdkImageName -c $configuration"
     if ($useWindowsContainers) {
         $LIBRARIES_BUILD_ARGS += " -w"
@@ -78,17 +74,15 @@ if (!$noBuild) {
 
 # Run the stress app
 if (!$buildOnly) {
-    if ($dumpsSharePath) {
-        if ($useWindowsContainers) {
-            $env:DUMPS_SHARE_MOUNT_ROOT = "C:/dumps-share"
-        }
-        else {
-            $env:DUMPS_SHARE_MOUNT_ROOT = "/dumps-share"
-        }
-
-        $env:DUMPS_SHARE = $dumpsSharePath
-        New-Item -Force $env:DUMPS_SHARE -ItemType Directory
+    if ($useWindowsContainers) {
+        $env:DUMPS_SHARE_MOUNT_ROOT = "C:/dumps-share"
     }
+    else {
+        $env:DUMPS_SHARE_MOUNT_ROOT = "/dumps-share"
+    }
+
+    $env:DUMPS_SHARE = $dumpsSharePath
+    New-Item -Force $env:DUMPS_SHARE -ItemType Directory
 
     $env:STRESS_CLIENT_ARGS = $clientStressArgs
     $env:STRESS_SERVER_ARGS = $serverStressArgs

From 1fcb7074737b3a0007bf7ae97bbc6a8e7ebb2f6c Mon Sep 17 00:00:00 2001
From: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
Date: Thu, 10 Oct 2024 13:43:16 +0200
Subject: [PATCH 04/10] Update
 src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1

Co-authored-by: Anton Firszov <antonfir@gmail.com>
---
 .../Common/tests/System/Net/StressTests/run-docker-compose.ps1  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1 b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
index 3159d641728588..cff6bb264858ca 100644
--- a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
+++ b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.ps1
@@ -55,7 +55,7 @@ if (!$noBuild) {
         "--build-arg", "VERSION=$Version",
         "--build-arg", "CONFIGURATION=$configuration"
     )
-    if (![string]::IsNullOrEmpty($sdkImageName)) {
+    if ($sdkImageName) {
         $BuildArgs += "--build-arg", "SDK_BASE_IMAGE=$sdkImageName"
     }
     $originalErrorPreference = $ErrorActionPreference

From bb42d51173215cd60382028999c864b82aa488e3 Mon Sep 17 00:00:00 2001
From: Radek Zikmund <r.zikmund.rz@gmail.com>
Date: Fri, 11 Oct 2024 10:22:40 +0200
Subject: [PATCH 05/10] Fix build

---
 .../tests/System/Net/StressTests/run-docker-compose.sh       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
index 4997977244b012..36d8822a306e6f 100755
--- a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
+++ b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
@@ -33,6 +33,7 @@ clientstressargs=""
 serverstressargs=""
 
 projectdir=$1
+shift 1
 if [[ ! -d "$projectdir" ]]; then
     echo "First argument must be path to the stress project directory"
     exit 1
@@ -41,7 +42,7 @@ fi
 dumpssharepath="$projectdir/dumps"
 
 while [[ $# > 0 ]]; do
-  opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
+  opt="$(printf "%s" "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
   case "$opt" in
     -dumpssharepath|-d)
       dumpssharepath=$2
@@ -99,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

From 03ca742e22c0304590f355f4a7ad5203ce255540 Mon Sep 17 00:00:00 2001
From: Radek Zikmund <r.zikmund.rz@gmail.com>
Date: Fri, 11 Oct 2024 10:23:48 +0200
Subject: [PATCH 06/10] Remove version, add volumes mapping

---
 .../tests/StressTests/HttpStress/docker-compose.yml          | 1 -
 .../tests/StressTests/SslStress/docker-compose.yml           | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml
index 5f7237f220d499..a42a0c72810d59 100644
--- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml
+++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   client:
     build:
diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/docker-compose.yml b/src/libraries/System.Net.Security/tests/StressTests/SslStress/docker-compose.yml
index a02e123f5cbf90..4c17d864726fff 100644
--- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/docker-compose.yml
+++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/docker-compose.yml
@@ -1,9 +1,10 @@
-version: '3'
 services:
   client:
     build:
       context: ../../../../ # ~> src/libraries
       dockerfile: ./System.Net.Security/tests/StressTests/SslStress/${DOCKERFILE:-Dockerfile}
+    volumes:
+      - "${DUMPS_SHARE}:${DUMPS_SHARE_MOUNT_ROOT}"
     links:
       - server
     environment:
@@ -12,6 +13,8 @@ services:
     build:
       context: ../../../../ # ~> src/libraries
       dockerfile: ./System.Net.Security/tests/StressTests/SslStress/${DOCKERFILE:-Dockerfile}
+    volumes:
+      - "${DUMPS_SHARE}:${DUMPS_SHARE_MOUNT_ROOT}"
     ports:
       - "5001:5001"
     environment:

From 44683fe4d5cd729a0eb4b91b3f92a200fbf9ce77 Mon Sep 17 00:00:00 2001
From: Radek Zikmund <r.zikmund.rz@gmail.com>
Date: Fri, 11 Oct 2024 10:28:20 +0200
Subject: [PATCH 07/10] fix ssl.yml

---
 eng/pipelines/libraries/stress/ssl.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml
index 7593bfd64ea6b3..6e4c7fecca29b4 100644
--- a/eng/pipelines/libraries/stress/ssl.yml
+++ b/eng/pipelines/libraries/stress/ssl.yml
@@ -59,7 +59,7 @@ extends:
             export STRESS_CLIENT_ARGS=$SSLSTRESS_CLIENT_ARGS
             export STRESS_SERVER_ARGS=$SSLSTRESS_SERVER_ARGS
             mkdir -p $DUMPS_SHARE
-            docker compose up --abort-on-container-exit --no-color
+            docker-compose up --abort-on-container-exit --no-color
           displayName: Run SslStress
 
         - publish: $(Build.ArtifactStagingDirectory)/dumps

From 4468ee51f5f13bd435e06a7c1084648af3211970 Mon Sep 17 00:00:00 2001
From: Radek Zikmund <r.zikmund.rz@gmail.com>
Date: Fri, 11 Oct 2024 10:28:56 +0200
Subject: [PATCH 08/10] Fix http.yml

---
 eng/pipelines/libraries/stress/http.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml
index 314e0eddee6e38..4e10656301c329 100644
--- a/eng/pipelines/libraries/stress/http.yml
+++ b/eng/pipelines/libraries/stress/http.yml
@@ -62,7 +62,7 @@ extends:
             export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 3.0"
             export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 3.0"
             mkdir -p $DUMPS_SHARE
-            docker compose up --abort-on-container-exit --no-color
+            docker-compose up --abort-on-container-exit --no-color
           timeoutInMinutes: 35 # In case the HTTP/3.0 run hangs, we timeout shortly after the expected 30 minute run
           displayName: Run HttpStress - HTTP 3.0
           condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
@@ -72,7 +72,7 @@ extends:
             export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 2.0"
             export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 2.0"
             mkdir -p $DUMPS_SHARE
-            docker compose up --abort-on-container-exit --no-color
+            docker-compose up --abort-on-container-exit --no-color
           displayName: Run HttpStress - HTTP 2.0
           condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
 
@@ -81,7 +81,7 @@ extends:
             export STRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 1.1"
             export STRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 1.1"
             mkdir -p $DUMPS_SHARE
-            docker compose up --abort-on-container-exit --no-color
+            docker-compose up --abort-on-container-exit --no-color
           displayName: Run HttpStress - HTTP 1.1
           condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true'))
 

From 75bbb0884c677ccab7ef08e8a4c79ee5370d7d01 Mon Sep 17 00:00:00 2001
From: antonfirsov <antonfir@gmail.com>
Date: Fri, 11 Oct 2024 19:34:17 +0200
Subject: [PATCH 09/10] add back 'version' to SslStress compose file

---
 .../tests/StressTests/SslStress/docker-compose.yml               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/docker-compose.yml b/src/libraries/System.Net.Security/tests/StressTests/SslStress/docker-compose.yml
index 4c17d864726fff..4b71a04109b045 100644
--- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/docker-compose.yml
+++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/docker-compose.yml
@@ -1,3 +1,4 @@
+version: '3' # Although the version attribute is obsolete and should be ignored, it's seemingly not the case on Build.Ubuntu.2204.Amd64.Open
 services:
   client:
     build:

From 0f2e5a518de66dca4ea2d6b924c63900891858b1 Mon Sep 17 00:00:00 2001
From: Radek Zikmund <r.zikmund.rz@gmail.com>
Date: Mon, 21 Oct 2024 12:51:48 +0200
Subject: [PATCH 10/10] use docker-compose to invoke stress locally

---
 .../Common/tests/System/Net/StressTests/run-docker-compose.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
index 36d8822a306e6f..34aada4b04b508 100755
--- a/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
+++ b/src/libraries/Common/tests/System/Net/StressTests/run-docker-compose.sh
@@ -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