Merge pull request #18413 from jtattermusch/interop_get_dotnet

Ensure we have the right version of dotnet SDK when building grpc-dotnet interop image.
pull/18242/head
Jan Tattermusch 6 years ago committed by GitHub
commit f019bcb4a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/Dockerfile.template
  2. 1
      templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template
  3. 3
      tools/dockerfile/interoptest/grpc_interop_aspnetcore/Dockerfile
  4. 1
      tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh

@ -16,5 +16,8 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview3-stretch
# needed by get-dotnet.sh script
RUN apt-get update && apt-get install -y jq && apt-get clean
# Define the default command.
CMD ["bash"]

@ -25,6 +25,7 @@
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc-dotnet
./build/get-dotnet.sh
./build/get-grpc.sh
cd testassets/InteropTestsWebsite

@ -14,5 +14,8 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview3-stretch
# needed by get-dotnet.sh script
RUN apt-get update && apt-get install -y jq && apt-get clean
# Define the default command.
CMD ["bash"]

@ -23,6 +23,7 @@ git clone /var/local/jenkins/grpc-dotnet /var/local/git/grpc-dotnet
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc-dotnet
./build/get-dotnet.sh
./build/get-grpc.sh
cd testassets/InteropTestsWebsite

Loading…
Cancel
Save