diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-03-30 12:06:16 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-03-30 12:06:16 +0200 |
| commit | d604cb0ae007e88fe8be9770ef8dcbf41d3fb003 (patch) | |
| tree | 121415710b743fcf1d094136f63f7a76033965de /docker | |
| parent | ba1d9a4bab4d938449b1e0c7478280ebf79af715 (diff) | |
Add llvm3.9 in docker files.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile.build | 7 | ||||
| -rw-r--r-- | docker/Dockerfile.run | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index 6065feb2a5b..75dee2bd0a7 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -4,7 +4,8 @@ FROM centos:7 RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo && \ yum -y install epel-release && \ yum -y install centos-release-scl && \ - yum -y install devtoolset-6-gcc-c++ \ + yum -y --enablerepo=epel-testing install \ + devtoolset-6-gcc-c++ \ devtoolset-6-libatomic-devel \ devtoolset-6-binutils \ make \ @@ -15,8 +16,8 @@ RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vesp zlib-devel \ maven \ libicu-devel \ - llvm-devel \ - llvm-static \ + llvm3.9-devel \ + llvm3.9-static \ java-1.8.0-openjdk-devel \ openssl \ openssl-devel \ diff --git a/docker/Dockerfile.run b/docker/Dockerfile.run index 1879a96349d..0f57da4b111 100644 --- a/docker/Dockerfile.run +++ b/docker/Dockerfile.run @@ -4,11 +4,12 @@ FROM centos:7 RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo && \ yum -y install epel-release && \ yum -y install centos-release-scl && \ - yum -y install Judy \ + yum -y --enablerepo=epel-testing install \ + Judy \ lz4 \ zlib \ libicu \ - llvm \ + llvm3.9 \ java-1.8.0-openjdk \ openssl \ perl \ |