From d9c253fe323b6b736fd83bd8fa1d632d73741d46 Mon Sep 17 00:00:00 2001 From: apolcyn Date: Fri, 26 Jan 2024 13:44:14 -0800 Subject: [PATCH] [csharp] try rebuilding distrib ubuntu image (#35674) rebuilt `tools/dockerfile/distribtest/csharp_ubuntu2204_x64/Dockerfile` (without actually changing anything in the docker instructions) in an attempt to fix `The SSL connection could not be established, see inner exception.` errors happening in `dotnet restore` commands in distrib tests using this image. Closes #35674 PiperOrigin-RevId: 601856906 --- tools/bazelify_tests/dockerimage_current_versions.bzl | 2 +- .../distribtest/csharp_ubuntu2204_x64.current_version | 2 +- tools/dockerfile/distribtest/csharp_ubuntu2204_x64/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl index a3824b0763f..1d4696194d1 100644 --- a/tools/bazelify_tests/dockerimage_current_versions.bzl +++ b/tools/bazelify_tests/dockerimage_current_versions.bzl @@ -34,7 +34,7 @@ DOCKERIMAGE_CURRENT_VERSIONS = { "tools/dockerfile/distribtest/csharp_debian10_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian10_x64@sha256:8c3838e731da70566adc6f989f2c29351fdb2f629e8797928699fff24b3a0938", "tools/dockerfile/distribtest/csharp_dotnet31_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_dotnet31_x64@sha256:fee52df6064ff84bc9af644c2ea17ab579de3401e3a167d0d43383c24f0d500f", "tools/dockerfile/distribtest/csharp_dotnet5_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_dotnet5_x64@sha256:408425cd74bb8b79a3b09a64ea6c54f6cdc0e757a3469f31effc017a7187e442", - "tools/dockerfile/distribtest/csharp_ubuntu2204_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_ubuntu2204_x64@sha256:d77c2dd1c94049e178dbc5cd3bc47199270c12ce3f1f2558b46e978707c63563", + "tools/dockerfile/distribtest/csharp_ubuntu2204_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_ubuntu2204_x64@sha256:6e43e2c8de47534bd3e478857aa14ba484ecebcd6756dd882782f6ca71a60dc3", "tools/dockerfile/distribtest/php7_debian10_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/php7_debian10_x64@sha256:e760a60f2dce2dada571d9b07447a9f99ffeeb366a309dbbb5dc0a43991c22dc", "tools/dockerfile/distribtest/python_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64@sha256:699ac7b86199406fa27e88f30a1c623ef34ac33f6d9330fd13a6f6457ee4e19f", "tools/dockerfile/distribtest/python_arch_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_arch_x64@sha256:2c1adadeb010e107132cf5137f32a2d18727796631245b110cc74f69c07502e1", diff --git a/tools/dockerfile/distribtest/csharp_ubuntu2204_x64.current_version b/tools/dockerfile/distribtest/csharp_ubuntu2204_x64.current_version index 00228ab24a3..006fed2d4a7 100644 --- a/tools/dockerfile/distribtest/csharp_ubuntu2204_x64.current_version +++ b/tools/dockerfile/distribtest/csharp_ubuntu2204_x64.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_ubuntu2204_x64:780dbf3f24a43bd722a673a5a3a4161648a605d4@sha256:d77c2dd1c94049e178dbc5cd3bc47199270c12ce3f1f2558b46e978707c63563 \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_ubuntu2204_x64:8add2411b0e373dcdfa08774d10597e433c638ee@sha256:6e43e2c8de47534bd3e478857aa14ba484ecebcd6756dd882782f6ca71a60dc3 \ No newline at end of file diff --git a/tools/dockerfile/distribtest/csharp_ubuntu2204_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_ubuntu2204_x64/Dockerfile index 9a713cc5e09..c906b51ea3f 100644 --- a/tools/dockerfile/distribtest/csharp_ubuntu2204_x64/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_ubuntu2204_x64/Dockerfile @@ -38,7 +38,7 @@ RUN curl -sSL -o dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/Sd RUN apt-get update && apt-get install -y unzip && apt-get clean -# Make sure the mono certificate store is up-to-date to prevent issues with nuget restore +# Make sure the mono certificate store is up to date to prevent issues with nuget restore RUN apt-get update && apt-get install -y curl && apt-get clean RUN curl https://curl.haxx.se/ca/cacert.pem > ~/cacert.pem && cert-sync ~/cacert.pem && rm -f ~/cacert.pem