From c76bfe5ad31f81ca6c15ff15b7da5c74b5ac29c7 Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Tue, 25 Apr 2023 19:27:47 +0200 Subject: [PATCH 1/3] attempt to fix stress build --- eng/docker/libraries-sdk.linux.Dockerfile | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile index a06bd46fcb729a..b612df5ec079f2 100644 --- a/eng/docker/libraries-sdk.linux.Dockerfile +++ b/eng/docker/libraries-sdk.linux.Dockerfile @@ -1,9 +1,30 @@ # Builds and copies library artifacts into target dotnet sdk image -ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754 +ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:7.0-bullseye-slim FROM $BUILD_BASE_IMAGE as corefxbuild +# Enable openssl legacy provider in system openssl config +RUN fixOpensslConf=$(mktemp) && \ + printf "#!/usr/bin/env sh\n\ + sed -i '\n\ + # Append 'legacy = legacy_sect' after 'default = default_sect' under [provider_sect] + /^default = default_sect/a legacy = legacy_sect\n\ + # Search for [default_sect] + /\[default_sect\]/ {\n\ + # Go to next line + n\n\ + # Uncomment '# activate = 1' + s/# //\n\ + # Append new [legacy_sect], with 'activate = 1' + a\n\ + a [legacy_sect]\n\ + a activate = 1\n\ + }\n\ + ' /etc/ssl/openssl.cnf\n" > $fixOpensslConf && \ + sh $fixOpensslConf && \ + rm $fixOpensslConf + ARG CONFIGURATION=Release WORKDIR /repo From f2ff258c848b37f68484a9c7de6933168d1052bb Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Wed, 26 Apr 2023 01:21:14 +0200 Subject: [PATCH 2/3] undo switching to Ubuntu --- eng/docker/libraries-sdk.linux.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile index b612df5ec079f2..4339e19eea4390 100644 --- a/eng/docker/libraries-sdk.linux.Dockerfile +++ b/eng/docker/libraries-sdk.linux.Dockerfile @@ -1,5 +1,5 @@ # Builds and copies library artifacts into target dotnet sdk image -ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 +ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7 ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:7.0-bullseye-slim FROM $BUILD_BASE_IMAGE as corefxbuild From 2cc7aa947a63d86ed638123d21e068b6c1fd1300 Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Wed, 26 Apr 2023 13:23:06 +0200 Subject: [PATCH 3/3] use centos-stream8 and delete openssl hack --- eng/docker/libraries-sdk.linux.Dockerfile | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile index 4339e19eea4390..8d7d6169a9fe92 100644 --- a/eng/docker/libraries-sdk.linux.Dockerfile +++ b/eng/docker/libraries-sdk.linux.Dockerfile @@ -1,30 +1,9 @@ # Builds and copies library artifacts into target dotnet sdk image -ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7 +ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:7.0-bullseye-slim FROM $BUILD_BASE_IMAGE as corefxbuild -# Enable openssl legacy provider in system openssl config -RUN fixOpensslConf=$(mktemp) && \ - printf "#!/usr/bin/env sh\n\ - sed -i '\n\ - # Append 'legacy = legacy_sect' after 'default = default_sect' under [provider_sect] - /^default = default_sect/a legacy = legacy_sect\n\ - # Search for [default_sect] - /\[default_sect\]/ {\n\ - # Go to next line - n\n\ - # Uncomment '# activate = 1' - s/# //\n\ - # Append new [legacy_sect], with 'activate = 1' - a\n\ - a [legacy_sect]\n\ - a activate = 1\n\ - }\n\ - ' /etc/ssl/openssl.cnf\n" > $fixOpensslConf && \ - sh $fixOpensslConf && \ - rm $fixOpensslConf - ARG CONFIGURATION=Release WORKDIR /repo