fixup

6 years ago · 385af3bc61
parent c24acc3d4a
commit 385af3bc61
2 changed files with 12 additions and 2 deletions
--- a/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template
@ -25,8 +25,13 @@
  cp -r /var/local/jenkins/service_account $HOME || true

  cd /var/local/git/grpc-dotnet
+  
+  # If needed, update dotnet SDK and put it on path
  ./build/get-dotnet.sh
-  export PATH="$HOME/.dotnet/:$PATH"
+  if [ -f $HOME/.dotnet/dotnet ]
+  then
+    ln -s $HOME/.dotnet/dotnet /usr/local/bin/dotnet
+  fi
  
  ./build/get-grpc.sh

--- a/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh
+++ b/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh
@ -23,8 +23,13 @@ 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
+
+# If needed, update dotnet SDK and put it on path
 ./build/get-dotnet.sh
-export PATH="$HOME/.dotnet/:$PATH"
+if [ -f $HOME/.dotnet/dotnet ]
+then
+  ln -s $HOME/.dotnet/dotnet /usr/local/bin/dotnet
+fi

 ./build/get-grpc.sh