Skip to content

Commit

Permalink
Add GCC 11 tooling to CentOS 7 package builders. (#303)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ferroin authored Oct 23, 2024
1 parent 97d655b commit 2d441dd
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 1 deletion.
5 changes: 5 additions & 0 deletions package-builders/Dockerfile.centos7.v1
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ ENV VERSION=$VERSION
# Dummy Sentry DSN
ENV SENTRY_DSN="https://[email protected]/dummy"

COPY package-builders/centos-7-scl.repo /etc/yum.repos.d/centos-7-scl.repo
COPY package-builders/RPM-GPG-KEY-CentOS-SIG-SCLo /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo

RUN yum install -y epel-release && \
yum update -y && \
yum install -y autoconf \
Expand All @@ -22,6 +25,7 @@ RUN yum install -y epel-release && \
cmake \
cups-devel \
curl \
devtoolset-11 \
diffutils \
elfutils-libelf-devel \
findutils \
Expand Down Expand Up @@ -66,6 +70,7 @@ RUN yum install -y epel-release && \
c_rehash && \
mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS


# Fetch a newer version of CMake, because the system-provided one is _ancient_.
# The hash is hard-coded here to mitigate the risk of supply-chain attacks.
RUN curl --fail -sSL --connect-timeout 20 --retry 3 --output cmake-linux-$(uname -m).sh \
Expand Down
4 changes: 4 additions & 0 deletions package-builders/Dockerfile.centos7.v2
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ ENV VERSION=$VERSION
# Dummy Sentry DSN
ENV SENTRY_DSN="https://[email protected]/dummy"

COPY package-builders/centos-7-scl.repo /etc/yum.repos.d/centos-7-scl.repo
COPY package-builders/RPM-GPG-KEY-CentOS-SIG-SCLo /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo

RUN yum install -y epel-release && \
yum update -y && \
yum install -y bash \
Expand All @@ -18,6 +21,7 @@ RUN yum install -y epel-release && \
cmake \
cups-devel \
curl \
devtoolset-11 \
diffutils \
elfutils-libelf-devel \
findutils \
Expand Down
20 changes: 20 additions & 0 deletions package-builders/RPM-GPG-KEY-CentOS-SIG-SCLo
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.22 (GNU/Linux)

mQENBFYM/AoBCADR9Q5cb+H5ndx+QkzNBQ88wcD+g112yvnHNlSiBMOnNEGHuKPJ
tujZ+eWXP3K6ucJckT91WxfQ2fxPr9jQ0xpZytcHcZdTfn3vKL9+OwR0npp+qmcz
rK8/EzVz/SWSgBQ5xT/HUvaeoVAbzBHSng0r2njnBAqABKAoTxgyRGKSCWduKD32
7PF2ZpqeDFFhd99Ykt6ar8SlV8ToqH6F7An0ILeejINVbHUxd6+wsbpcOwQ4mGAa
/CPXeqqLGj62ASBv36xQr34hlN/9zQMViaKkacl8zkuvwhuHf4b4VlGVCe6VILpQ
8ytKMV/lcg7YpMfRq4KVWBjCwkvk6zg6KxaHABEBAAG0aENlbnRPUyBTb2Z0d2Fy
ZUNvbGxlY3Rpb25zIFNJRyAoaHR0cHM6Ly93aWtpLmNlbnRvcy5vcmcvU3BlY2lh
bEludGVyZXN0R3JvdXAvU0NMbykgPHNlY3VyaXR5QGNlbnRvcy5vcmc+iQE5BBMB
AgAjBQJWDPwKAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQTrhOcfLu
nVXNewgAg7RVclomjTY4w80XiztUuUaFlCHyR76KazdaGfx/8XckWH2GdQtwii+3
Tg7+PT2H0Xyuj1aod+jVTPXTPVUr+rEHAjuNDY+xyAJrNljoOHiz111zs9pk7PLX
CPwKWQLnmrcKIi8v/51L79FFsUMvhClTBdLUQ51lkCwbcXQi+bOhPvZTVbRhjoB/
a9z0d8t65X16zEzE7fBhnVoj4xye/MPMbTH41Mv+FWVciBTuAepOLmgJ9oxODliv
rgZa28IEWkvHQ8m9GLJ0y9mI6olh0cGFybnd5y4Ss1cMttlRGR4qthLhN2gHZpO9
2y4WgkeVXCj1BK1fzVrDMLPbuNNCZQ==
=UtPD
-----END PGP PUBLIC KEY BLOCK-----
15 changes: 15 additions & 0 deletions package-builders/centos-7-scl.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[centos-sclo-sclo]
name=CentOS-7 - SCLo sclo
baseurl=http://vault.centos.org/centos/7.9.2009/sclo/$basearch/sclo/
#mirrorlist=http://mirrorlist.centos.org?arch=$basearch&release=7&repo=sclo-sclo
gpgcheck=1
enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo

[centos-sclo-rh]
name=CentOS-7 - SCLo rh
baseurl=http://vault.centos.org/centos/7.9.2009/sclo/$basearch/rh/
#mirrorlist=http://mirrorlist.centos.org?arch=$basearch&release=7&repo=sclo-rh
gpgcheck=1
enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
6 changes: 5 additions & 1 deletion package-builders/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
#!/bin/sh

if [ -e /opt/rh/devtoolset-11/enable ]; then
. /opt/rh/devtoolset-11/enable
fi

if [ -d /cmake/bin ]; then
PATH="/cmake/bin:${PATH}"
fi

if [ -n "$NETDATA_SENTRY_DSN" ]; then
SENTRY_DSN="$NETDATA_SENTRY_DSN"
SENTRY_DSN="$NETDATA_SENTRY_DSN"
fi

fail() {
Expand Down

0 comments on commit 2d441dd

Please sign in to comment.