diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl index 25b345c7b3a..8cd4c5fc18e 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:e02f13b01bfa5511c98fdad36a5258576517f4f3b727a88f881b98f4d79d23f5", + "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/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 7b28ed0f0ea..00228ab24a3 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:0633fc6f5a0d1df7cf0e2d71527319ab6baeade3@sha256:e02f13b01bfa5511c98fdad36a5258576517f4f3b727a88f881b98f4d79d23f5 \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_ubuntu2204_x64:780dbf3f24a43bd722a673a5a3a4161648a605d4@sha256:d77c2dd1c94049e178dbc5cd3bc47199270c12ce3f1f2558b46e978707c63563 \ 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 6d40f82dee8..9a713cc5e09 100644 --- a/tools/dockerfile/distribtest/csharp_ubuntu2204_x64/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_ubuntu2204_x64/Dockerfile @@ -42,6 +42,11 @@ RUN apt-get update && apt-get install -y unzip && apt-get clean 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 +# libssl 1.0. Ubuntu22.04 only has libssl 3 +RUN curl -sSL -o libssl1.0.0_1.0.2n-1ubuntu5.8_amd64.deb http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.13_amd64.deb +RUN dpkg -i libssl1.0.0_1.0.2n-1ubuntu5.8_amd64.deb +RUN rm libssl1.0.0_1.0.2n-1ubuntu5.8_amd64.deb + # we have a separate distribtest for netcoreapp3.1 ENV SKIP_NETCOREAPP31_DISTRIBTEST=1 # we have a separate distribtest for net5.0