diff options
| author | Marie Píchová <11718369+ManickaP@users.noreply.github.com> | 2020-08-26 19:41:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-26 19:41:38 +0300 |
| commit | a9a07798f46b12e708d48b1d59313549ee0bb8f9 (patch) | |
| tree | 67e206fa322e77092196f3718b4e7f3ac19115e4 /eng/docker | |
| parent | 334e5e26f7b9ded08bd9ab967023b02b5a2de210 (diff) | |
HTTP stress docker fix (#41397)
Fixed docker files not using currently built runtime for http stress test.
Diffstat (limited to 'eng/docker')
4 files changed, 4 insertions, 4 deletions
diff --git a/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile b/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile index 01241c558d7..b0bf080d8ff 100644 --- a/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile +++ b/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile @@ -23,7 +23,7 @@ ARG COREFX_SHARED_FRAMEWORK_NAME=Microsoft.NETCore.App ARG ASPNETCORE_SHARED_NAME=Microsoft.AspNetCore.App ARG SOURCE_COREFX_VERSION=6.0.0 ARG TARGET_SHARED_FRAMEWORK=/usr/share/dotnet/shared -ARG TARGET_COREFX_VERSION=6.0.0 +ARG TARGET_COREFX_VERSION=$DOTNET_VERSION COPY --from=corefxbuild \ $TESTHOST_LOCATION/$TFM-$OS-$CONFIGURATION-$ARCH/shared/$COREFX_SHARED_FRAMEWORK_NAME/$SOURCE_COREFX_VERSION/* \ diff --git a/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile b/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile index fdde94c31e7..6e860466a1b 100644 --- a/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile +++ b/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile @@ -13,7 +13,7 @@ ARG COREFX_SHARED_FRAMEWORK_NAME=Microsoft.NETCore.App ARG ASPNETCORE_SHARED_NAME=Microsoft.AspNetCore.App ARG SOURCE_COREFX_VERSION=6.0.0 ARG TARGET_SHARED_FRAMEWORK="C:\\Program Files\\dotnet\\shared" -ARG TARGET_COREFX_VERSION=6.0.0 +ARG TARGET_COREFX_VERSION=$DOTNET_VERSION COPY ` $TESTHOST_LOCATION\$TFM-$OS-$CONFIGURATION-$ARCH\shared\$COREFX_SHARED_FRAMEWORK_NAME\$SOURCE_COREFX_VERSION\ ` diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile index 8d12c564c85..4f1cb5185a3 100644 --- a/eng/docker/libraries-sdk.linux.Dockerfile +++ b/eng/docker/libraries-sdk.linux.Dockerfile @@ -21,7 +21,7 @@ ARG CONFIGURATION=Release ARG COREFX_SHARED_FRAMEWORK_NAME=Microsoft.NETCore.App ARG SOURCE_COREFX_VERSION=6.0.0 ARG TARGET_SHARED_FRAMEWORK=/usr/share/dotnet/shared -ARG TARGET_COREFX_VERSION=6.0.0 +ARG TARGET_COREFX_VERSION=$DOTNET_VERSION COPY --from=corefxbuild \ $TESTHOST_LOCATION/$TFM-$OS-$CONFIGURATION-$ARCH/shared/$COREFX_SHARED_FRAMEWORK_NAME/$SOURCE_COREFX_VERSION/* \ diff --git a/eng/docker/libraries-sdk.windows.Dockerfile b/eng/docker/libraries-sdk.windows.Dockerfile index d6c82eafc0e..e88f52d7ce7 100644 --- a/eng/docker/libraries-sdk.windows.Dockerfile +++ b/eng/docker/libraries-sdk.windows.Dockerfile @@ -12,7 +12,7 @@ ARG CONFIGURATION=Release ARG COREFX_SHARED_FRAMEWORK_NAME=Microsoft.NETCore.App ARG SOURCE_COREFX_VERSION=6.0.0 ARG TARGET_SHARED_FRAMEWORK="C:\\Program Files\\dotnet\\shared" -ARG TARGET_COREFX_VERSION=6.0.0 +ARG TARGET_COREFX_VERSION=$DOTNET_VERSION COPY ` $TESTHOST_LOCATION\$TFM-$OS-$CONFIGURATION-$ARCH\shared\$COREFX_SHARED_FRAMEWORK_NAME\$SOURCE_COREFX_VERSION\ ` |