From 401c751cb40b4f6ade447041d508a06b75bce21d Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 4 Nov 2022 17:27:27 +0100 Subject: [PATCH] Update dart SDK version in dart interop image (#31542) * update dart SDK version in dart interop image * fix dart interop docker build --- .../interoptest/grpc_interop_dart/build_interop.sh.template | 2 +- tools/dockerfile/interoptest/grpc_interop_dart/Dockerfile | 2 +- tools/dockerfile/interoptest/grpc_interop_dart/build_interop.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_dart/build_interop.sh.template b/templates/tools/dockerfile/interoptest/grpc_interop_dart/build_interop.sh.template index c3a9c7fb892..a8d02e29373 100644 --- a/templates/tools/dockerfile/interoptest/grpc_interop_dart/build_interop.sh.template +++ b/templates/tools/dockerfile/interoptest/grpc_interop_dart/build_interop.sh.template @@ -26,4 +26,4 @@ cd /var/local/git/grpc-dart/interop # De-flake attempt: run the cmd one more time in case of transient failure - /usr/lib/dart/bin/pub get --verbose || /usr/lib/dart/bin/pub get --verbose + /usr/lib/dart/bin/dart pub get --verbose || /usr/lib/dart/bin/dart pub get --verbose diff --git a/tools/dockerfile/interoptest/grpc_interop_dart/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_dart/Dockerfile index 6ff573470f8..4e4a0c7a849 100644 --- a/tools/dockerfile/interoptest/grpc_interop_dart/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_dart/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM google/dart:2.12 +FROM dart:2.18-sdk # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/interoptest/grpc_interop_dart/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_dart/build_interop.sh index 2b4c07ed128..e3c67df4c8f 100644 --- a/tools/dockerfile/interoptest/grpc_interop_dart/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_dart/build_interop.sh @@ -24,4 +24,4 @@ cp -r /var/local/jenkins/service_account $HOME || true cd /var/local/git/grpc-dart/interop # De-flake attempt: run the cmd one more time in case of transient failure -/usr/lib/dart/bin/pub get --verbose || /usr/lib/dart/bin/pub get --verbose +/usr/lib/dart/bin/dart pub get --verbose || /usr/lib/dart/bin/dart pub get --verbose