This is an automated email from the ASF dual-hosted git repository. jking pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/thrift.git
commit c64389a194fe1516fef5830151dfb8b35f6c6bb2 Author: Brian Forbis <bfor...@athenahealth.com> AuthorDate: Sat Sep 22 07:36:24 2018 -0400 THRIFT-4625: Pin dart version to 1.x in build --- build/docker/ubuntu-artful/Dockerfile | 5 +++-- build/docker/ubuntu-bionic/Dockerfile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/docker/ubuntu-artful/Dockerfile b/build/docker/ubuntu-artful/Dockerfile index 4ea95d5..abe84d1 100644 --- a/build/docker/ubuntu-artful/Dockerfile +++ b/build/docker/ubuntu-artful/Dockerfile @@ -15,7 +15,7 @@ # Using all stock Ubuntu Artful packaging except for: # - cpp: stock boost 1.62 in artful has a nasty bug so we use stock boost 1.63 # - d: dmd does not come with Ubuntu -# - dart: does not come with Ubuntu +# - dart: does not come with Ubuntu. Pinned to last 1.x release # - dotnet: does not come with Ubuntu # - haxe: version 3.4.2 that comes with Ubuntu cores in our CI build # - go: artful comes with 1.9, we want the latest (supported) @@ -47,6 +47,7 @@ RUN apt-get update && \ RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \ curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > \ /etc/apt/sources.list.d/dart_stable.list +ENV DART_VERSION 1.24.3-1 # dotnet (netcore) RUN curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/microsoft.gpg && \ @@ -122,7 +123,7 @@ RUN \ RUN apt-get install -y --no-install-recommends \ `# Dart dependencies` \ - dart/stable + dart=$DART_VERSION ENV PATH /usr/lib/dart/bin:$PATH RUN apt-get install -y --no-install-recommends \ diff --git a/build/docker/ubuntu-bionic/Dockerfile b/build/docker/ubuntu-bionic/Dockerfile index da574e1..795c086 100644 --- a/build/docker/ubuntu-bionic/Dockerfile +++ b/build/docker/ubuntu-bionic/Dockerfile @@ -15,7 +15,7 @@ # Using all stock Ubuntu Bionic packaging except for: # - cl: want latest # - d: dmd does not come with Ubuntu -# - dart: does not come with Ubuntu +# - dart: does not come with Ubuntu. Pinned to last 1.x release # - dotnet: does not come with Ubuntu # - go: want latest # - nodejs: want v8, bionic comes with v6 @@ -46,6 +46,7 @@ RUN apt-get update && \ RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \ curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > \ /etc/apt/sources.list.d/dart_stable.list +ENV DART_VERSION 1.24.3-1 # dotnet (netcore) RUN curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/microsoft.gpg && \ @@ -119,7 +120,7 @@ RUN \ RUN apt-get install -y --no-install-recommends \ `# Dart dependencies` \ - dart/stable + dart=$DART_VERSION ENV PATH /usr/lib/dart/bin:$PATH RUN apt-get install -y --no-install-recommends \