diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-01-11 08:39:14 +0100 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-01-11 08:39:14 +0100 |
| commit | ef5c1575fa16b0688545f393552e9c312203ecb5 (patch) | |
| tree | d36823109be3fb6d4adb757a62b05794d4cb6b59 /docker | |
| parent | 8e67ba0904d753efdfa58d28ba60af895b04d4fa (diff) | |
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 |