From c95e1ff0e565b7c95ef73f31105dea3414e6023b Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Fri, 12 Feb 2021 15:44:58 -0800 Subject: [PATCH] Use template to generate the Dockerfile --- .../dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template | 6 ++---- tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template index 4e0e7b384e3..de25278e203 100644 --- a/templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template @@ -23,10 +23,8 @@ <%include file="../../cmake.include"/> <%include file="../../run_tests_addons.include"/> - # The clang-3.6 symlink for the default clang version was added - # to Ubuntu 16.04 recently, so make sure it's installed. - # Also install clang3.7. - RUN apt-get update && apt-get -y install clang-3.6 clang-3.7 && apt-get clean + # Installs clang 4.0 and 5.0, the clang++ is included in clang packages + RUN apt-get update && apt-get -y install clang-4.0 clang-5.0 && apt-get clean # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile index f506c67b40b..42d5e9e9659 100644 --- a/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile @@ -82,7 +82,7 @@ RUN apt-get update && apt-get install -y cmake && apt-get clean RUN mkdir /var/local/jenkins -# Installs clang 4.0 and 5.0, the clang++ is included in clang pcakges +# Installs clang 4.0 and 5.0, the clang++ is included in clang packages RUN apt-get update && apt-get -y install clang-4.0 clang-5.0 && apt-get clean # Define the default command.