pdns-builder: devtoolset 3 through 5 are dead, switch to 6

diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index 021e996e17933ac9f6ede22cef5ce0f1b9b6a441..9877ad45370920d64735b54ba65559c23be84480 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -23,7 +23,7 @@ RUN find /pdns/builder-support/specs/ -not -name '*.spec' -exec ln -s {} /root/r
 
 @IF [ ! -z "$M_authoritative$M_all" ]
 RUN if $(grep -q 'release 6' /etc/redhat-release); then \
-      scl enable devtoolset-3 -- builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \
+      scl enable devtoolset-6 -- builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \
     else \
       builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \
     fi
@@ -31,7 +31,7 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \
 
 @IF [ ! -z "$M_recursor$M_all" ]
 RUN if $(grep -q 'release 6' /etc/redhat-release); then \
-      scl enable devtoolset-3 -- builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \
+      scl enable devtoolset-6 -- builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \
     else \
       builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \
     fi
@@ -39,7 +39,7 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \
 
 @IF [ ! -z "$M_dnsdist$M_all" ]
 RUN if $(grep -q 'release 6' /etc/redhat-release); then \
-      scl enable devtoolset-3 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
+      scl enable devtoolset-6 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
     else \
       builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
     fi

diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-6 b/builder-support/dockerfiles/Dockerfile.target.centos-6
index a4e2554cb5a7f295167ca1452acbbe3394bb1889..c3268b2084235e6888f15315d92234ceb3ee7170 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.centos-6
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-6
@@ -7,7 +7,7 @@ FROM centos:6 as dist-base
 RUN which yum
 RUN yum clean all
 RUN yum install -y --verbose epel-release centos-release-scl-rh && \
-    yum install -y --nogpgcheck devtoolset-3-gcc-c++
+    yum install -y --nogpgcheck devtoolset-6-gcc-c++
 
 # Do the actual rpm build
 @INCLUDE Dockerfile.rpmbuild