From f2958710ce4a31afc104cdbb9f92e86a04ed79b6 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Wed, 19 Oct 2022 16:11:53 +0200 Subject: [PATCH] el7: bump devtoolset to 11 --- builder-support/dockerfiles/Dockerfile.rpmbuild | 6 +++--- builder-support/dockerfiles/Dockerfile.target.centos-7 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild index 806c5c8222..b21923a435 100644 --- 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 [ -n "$M_authoritative$M_all" ] RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then \ - scl enable devtoolset-8 -- builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \ + scl enable devtoolset-11 -- 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 touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then @IF [ -n "$M_recursor$M_all" ] RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then \ - scl enable devtoolset-8 -- builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \ + scl enable devtoolset-11 -- builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \ else \ builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \ fi @@ -48,7 +48,7 @@ RUN touch /var/lib/rpm/* && mkdir /libh2o && cd /libh2o && \ make install RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then \ - scl enable devtoolset-8 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \ + scl enable devtoolset-11 -- 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-7 b/builder-support/dockerfiles/Dockerfile.target.centos-7 index 9deb58b99c..9bd7c2a124 100644 --- a/builder-support/dockerfiles/Dockerfile.target.centos-7 +++ b/builder-support/dockerfiles/Dockerfile.target.centos-7 @@ -12,7 +12,7 @@ FROM amd64/centos:7 as dist-base ARG BUILDER_CACHE_BUSTER= RUN touch /var/lib/rpm/* && yum install -y epel-release centos-release-scl-rh -RUN touch /var/lib/rpm/* && yum install -y --nogpgcheck devtoolset-8-gcc-c++ +RUN touch /var/lib/rpm/* && yum install -y --nogpgcheck devtoolset-11-gcc-c++ # Do the actual rpm build @INCLUDE Dockerfile.rpmbuild -- 2.47.2