diff options
| author |  Vijay Pai <vpai@google.com> | 2016-06-15 22:57:21 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-06-15 22:57:21 -0700 |
| commit | b9e927afcc689edaa5c02613a69fd9ceb944ec5b (patch) | |
| tree | 338945681c588bbce751c82575ceb9b8f9466d59 /tools/dockerfile/test/cxx_ubuntu1604_x64 | |
| parent | 20bf126da605e3c765ddc494ce92de3a7ff32795 (diff) | |
| parent | fa9b7c1bc6488be17d18007f45c57dac39ea5b79 (diff) | |
Merge branch 'master' into wheezy
Diffstat (limited to 'tools/dockerfile/test/cxx_ubuntu1604_x64')
| -rw-r--r-- | tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile index 02d3c0d9ad..d356433163 100644 --- a/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile @@ -82,5 +82,11 @@ RUN apt-get install -y libzookeeper-mt-dev RUN mkdir /var/local/jenkins + +# 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 + # Define the default command. CMD ["bash"] |