diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-01-11 09:00:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-11 09:00:14 +0100 |
| commit | e52c181c92edeaca0b5a64ae47d6265a40ca4e1a (patch) | |
| tree | 1b298fb9c86fa7e265d7cbf7f8ca018b6b961934 /docker | |
| parent | 4e0443a27ada35dd62bb8dc66e5f9c90254213b2 (diff) | |
| parent | ef5c1575fa16b0688545f393552e9c312203ecb5 (diff) | |
Merge pull request #1480 from yahoo/aressem/move-to-devtoolset-6
Moved to devtoolset-6. Using gcc 6.2.1
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index 77cdd55ef61..6065feb2a5b 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -4,8 +4,9 @@ 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-4-gcc-c++ \ - devtoolset-4-libatomic-devel \ + yum -y install devtoolset-6-gcc-c++ \ + devtoolset-6-libatomic-devel \ + devtoolset-6-binutils \ make \ cmake3 \ ccache \ @@ -28,6 +29,6 @@ RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vesp vespa-libtorrent-devel \ vespa-zookeeper-c-client-devel \ vespa-cppunit-devel && \ - echo "source /opt/rh/devtoolset-4/enable" > /etc/profile.d/devtoolset-4.sh && \ + echo "source /opt/rh/devtoolset-6/enable" > /etc/profile.d/devtoolset-6.sh && \ echo "* soft nproc 32768" > /etc/security/limits.d/90-nproc.conf |