From: Your Name <peter.van.dijk@powerdns.com>
Date: Thu, 3 Dec 2020 11:30:15 +0000 (+0100)
Subject: el6 builds: use vault.centos.org
X-Git-Tag: rec-4.3.7~2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6bf94f6abd879a7d7e28c40dcbc4c47ba5305c7;p=thirdparty%2Fpdns.git

el6 builds: use vault.centos.org

(cherry picked from commit 7476f49b4d78a5c687d36658b28109cb5f9386f6)
---

diff --git a/builder-support/dockerfiles/CentOS-SCLo-scl-rh.repo b/builder-support/dockerfiles/CentOS-SCLo-scl-rh.repo
new file mode 100644
index 0000000000..b1bb764e56
--- /dev/null
+++ b/builder-support/dockerfiles/CentOS-SCLo-scl-rh.repo
@@ -0,0 +1,8 @@
+[centos-sclo-rh]
+name=CentOS-6 - SCLo rh
+baseurl=http://vault.centos.org/centos/6/sclo/$basearch/rh/
+#mirrorlist=http://mirrorlist.centos.org?arch=$basearch&release=6&repo=sclo-rh
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
+
diff --git a/builder-support/dockerfiles/Centos-Base-Vault.repo b/builder-support/dockerfiles/Centos-Base-Vault.repo
new file mode 100644
index 0000000000..0fecdb809d
--- /dev/null
+++ b/builder-support/dockerfiles/Centos-Base-Vault.repo
@@ -0,0 +1,34 @@
+[base]
+name=CentOS-6.10 - Base
+baseurl=http://vault.centos.org/6.10/os/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+enabled=1
+
+[updates]
+name=CentOS-6.10 - Updates
+baseurl=http://vault.centos.org/6.10/updates/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+enabled=1
+
+[extras]
+name=CentOS-6.10 - Extras
+baseurl=http://vault.centos.org/6.10/extras/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+enabled=1
+
+[contrib]
+name=CentOS-6.10 - Contrib
+baseurl=http://vault.centos.org/6.10/contrib/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+enabled=1
+
+[centosplus]
+name=CentOS-6.10 - CentOSPlus
+baseurl=http://vault.centos.org/6.10/centosplus/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+enabled=1
diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-6 b/builder-support/dockerfiles/Dockerfile.target.centos-6
index 28e73cf160..f4da52c362 100644
--- a/builder-support/dockerfiles/Dockerfile.target.centos-6
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-6
@@ -4,11 +4,13 @@
 # This defines the dstribution base layer
 # Put only the bare minimum of common commands here, without dev tools
 FROM centos:6 as dist-base
+COPY /builder-support/dockerfiles/Centos-Base-Vault.repo /etc/yum.repos.d/CentOS-Base.repo
 ARG BUILDER_CACHE_BUSTER=
 RUN which yum
 RUN touch /var/lib/rpm/* && yum clean all
-RUN touch /var/lib/rpm/* && yum install -y --verbose epel-release centos-release-scl-rh && \
-    yum install -y --nogpgcheck devtoolset-7-gcc-c++
+RUN touch /var/lib/rpm/* && yum install -y --verbose epel-release centos-release-scl-rh
+COPY /builder-support/dockerfiles/CentOS-SCLo-scl-rh.repo /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
+RUN touch /var/lib/rpm/* &&  yum install -y --nogpgcheck devtoolset-7-gcc-c++
 
 # Do the actual rpm build
 @INCLUDE Dockerfile.rpmbuild