Skip to content

Commit 321e1df

Browse files
FerroinFerroin
committed
Clean up package builders in light of switch to CMake.
1 parent 8ddec94 commit 321e1df

20 files changed

+188
-311
lines changed

‎package-builders/Dockerfile.amazonlinux2‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,53 +9,49 @@ LABEL org.opencontainers.image.vendor="Netdata Inc."
99
ENV VERSION=$VERSION
1010

1111
RUN yum update -y && \
12-
yum install -y autoconf \
13-
autoconf-archive \
14-
autogen \
15-
automake \
16-
bison \
12+
yum install -y bison \
1713
bison-devel \
1814
cmake \
1915
cups-devel \
2016
curl \
2117
diffutils \
22-
elfutils-libelf-devel \
2318
findutils \
2419
flex \
2520
flex-devel \
26-
freeipmi-devel \
2721
gcc \
2822
gcc-c++ \
2923
git-core \
3024
golang \
31-
json-c-devel \
32-
libyaml-devel \
3325
libatomic \
3426
libcurl-devel \
35-
libmnl-devel \
36-
libnetfilter_acct-devel \
3727
libtool \
38-
libuuid-devel \
39-
libuv-devel \
4028
lm_sensors \
41-
lz4-devel \
4229
make \
4330
ninja \
44-
openssl-devel \
4531
openssl-perl \
4632
patch \
4733
pkgconfig \
34+
'pkgconfig(json-c)' \
35+
'pkgconfig(libelf)' \
36+
'pkgconfig(libipmimonitoring)' \
37+
'pkgconfig(libmnl)' \
38+
'pkgconfig(libnetfilter_acct)' \
39+
'pkgconfig(libsystemd)' \
40+
'pkgconfig(libuv)' \
41+
'pkgconfig(liblz4)' \
42+
'pkgconfig(openssl)' \
43+
'pkgconfig(snappy)' \
44+
'pkgconfig(uuid)' \
45+
'pkgconfig(yaml-0.1)' \
46+
'pkgconfig(zlib)' \
4847
procps \
4948
protobuf-c-devel \
5049
protobuf-compiler \
5150
protobuf-devel \
5251
rpm-build \
5352
rpm-devel \
5453
rpmdevtools \
55-
snappy-devel \
56-
systemd-devel \
57-
wget \
58-
zlib-devel && \
54+
wget && \
5955
yum clean all && \
6056
c_rehash && \
6157
mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS

‎package-builders/Dockerfile.amazonlinux2023‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,53 +11,45 @@ ENV VERSION=$VERSION
1111
RUN dnf distro-sync -y --nodocs && \
1212
dnf clean packages && \
1313
dnf install -y --nodocs --allowerasing --setopt=install_weak_deps=False --setopt=diskspacecheck=False \
14-
autoconf \
15-
autoconf-archive \
16-
automake \
1714
bison \
1815
bison-devel \
1916
cmake \
2017
cups-devel \
2118
curl \
2219
diffutils \
23-
elfutils-libelf-devel \
2420
findutils \
2521
flex \
2622
flex-devel \
2723
gcc \
2824
gcc-c++ \
2925
git-core \
3026
golang \
31-
json-c-devel \
32-
libyaml-devel \
3327
libatomic \
3428
libcurl-devel \
35-
libmnl-devel \
36-
# FIXME: broken / Missing
37-
# XXX: Can't (currently) find an AL2023 package for this :/
38-
# libnetfilter_acct-devel \
39-
libtool \
40-
libuuid-devel \
41-
libuv-devel \
4229
lm_sensors \
43-
lz4-devel \
4430
make \
4531
ninja-build \
46-
openssl-devel \
4732
openssl-perl \
4833
patch \
4934
pkgconfig \
35+
'pkgconfig(json-c)' \
36+
'pkgconfig(libelf)' \
37+
'pkgconfig(libsystemd)' \
38+
'pkgconfig(libuv)' \
39+
'pkgconfig(liblz4)' \
40+
'pkgconfig(openssl)' \
41+
'pkgconfig(snappy)' \
42+
'pkgconfig(uuid)' \
43+
'pkgconfig(yaml-0.1)' \
44+
'pkgconfig(zlib)' \
5045
procps \
5146
protobuf-c-devel \
5247
protobuf-compiler \
5348
protobuf-devel \
5449
rpm-build \
5550
rpm-devel \
5651
rpmdevtools \
57-
snappy-devel \
58-
systemd-devel \
59-
wget \
60-
zlib-devel && \
52+
wget && \
6153
rm -rf /var/cache/dnf && \
6254
c_rehash && \
6355
mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS

‎package-builders/Dockerfile.centos-stream8‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,37 @@ RUN dnf distro-sync -y --nodocs && \
1313
dnf config-manager --set-enabled powertools && \
1414
dnf clean packages && \
1515
dnf install -y --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \
16-
autoconf \
17-
autoconf-archive \
18-
autogen \
19-
automake \
20-
bash \
2116
bison \
2217
cmake \
2318
cups-devel \
2419
curl \
25-
libcurl-devel \
2620
diffutils \
27-
elfutils-libelf-devel \
2821
findutils \
2922
flex \
30-
freeipmi-devel \
3123
gcc \
3224
gcc-c++ \
3325
git \
3426
golang \
35-
json-c-devel \
3627
libatomic \
37-
libmnl-devel \
38-
libtool \
39-
libuuid-devel \
40-
libuv-devel \
41-
libyaml-devel \
28+
libcurl-devel \
4229
lm_sensors \
43-
lz4-devel \
4430
make \
4531
ninja-build \
4632
nc \
47-
openssl-devel \
4833
openssl-perl \
4934
patch \
5035
pkgconfig \
36+
'pkgconfig(json-c)' \
37+
'pkgconfig(libelf)' \
38+
'pkgconfig(libipmimonitoring)' \
39+
'pkgconfig(libsystemd)' \
40+
'pkgconfig(libuv)' \
41+
'pkgconfig(liblz4)' \
42+
'pkgconfig(openssl)' \
43+
'pkgconfig(snappy)' \
44+
'pkgconfig(uuid)' \
45+
'pkgconfig(yaml-0.1)' \
46+
'pkgconfig(zlib)' \
5147
procps \
5248
protobuf-c-devel \
5349
protobuf-compiler \
@@ -57,10 +53,7 @@ RUN dnf distro-sync -y --nodocs && \
5753
rpm-build \
5854
rpm-devel \
5955
rpmdevtools \
60-
snappy-devel \
61-
systemd-devel \
62-
wget \
63-
zlib-devel && \
56+
wget && \
6457
rm -rf /var/cache/dnf && \
6558
c_rehash && \
6659
mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS

‎package-builders/Dockerfile.centos-stream9‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,40 +13,36 @@ RUN dnf distro-sync -y --nodocs && \
1313
dnf config-manager --set-enabled crb && \
1414
dnf clean packages && \
1515
dnf install -y --allowerasing --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \
16-
autoconf \
17-
autoconf-archive \
18-
automake \
19-
bash \
2016
bison \
2117
cmake \
2218
cups-devel \
2319
curl \
2420
diffutils \
25-
elfutils-libelf-devel \
2621
findutils \
2722
flex \
28-
freeipmi-devel \
2923
gcc \
3024
gcc-c++ \
3125
git \
3226
golang \
33-
json-c-devel \
34-
libcurl-devel \
35-
libyaml-devel \
3627
libatomic \
37-
libmnl-devel \
38-
libtool \
39-
libuuid-devel \
40-
libuv-devel \
4128
lm_sensors \
42-
lz4-devel \
4329
make \
4430
ninja-build \
4531
nc \
46-
openssl-devel \
4732
openssl-perl \
4833
patch \
4934
pkgconfig \
35+
'pkgconfig(json-c)' \
36+
'pkgconfig(libelf)' \
37+
'pkgconfig(libipmimonitoring)' \
38+
'pkgconfig(libsystemd)' \
39+
'pkgconfig(libuv)' \
40+
'pkgconfig(liblz4)' \
41+
'pkgconfig(openssl)' \
42+
'pkgconfig(snappy)' \
43+
'pkgconfig(uuid)' \
44+
'pkgconfig(yaml-0.1)' \
45+
'pkgconfig(zlib)' \
5046
procps \
5147
protobuf-c-devel \
5248
protobuf-compiler \
@@ -56,10 +52,7 @@ RUN dnf distro-sync -y --nodocs && \
5652
rpm-build \
5753
rpm-devel \
5854
rpmdevtools \
59-
snappy-devel \
60-
systemd-devel \
61-
wget \
62-
zlib-devel && \
55+
wget && \
6356
rm -rf /var/cache/dnf && \
6457
c_rehash && \
6558
mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS

‎package-builders/Dockerfile.centos7‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,50 @@ ENV VERSION=$VERSION
1010

1111
RUN yum install -y epel-release && \
1212
yum update -y && \
13-
yum install -y autoconf \
14-
autoconf-archive \
15-
autogen \
16-
automake \
17-
bash \
13+
yum install -y bash \
1814
bison \
1915
bison-devel \
2016
cmake \
2117
cups-devel \
2218
curl \
2319
diffutils \
24-
elfutils-libelf-devel \
2520
findutils \
2621
flex \
2722
flex-devel \
28-
freeipmi-devel \
2923
gcc \
3024
gcc-c++ \
3125
git-core \
3226
golang \
33-
json-c-devel \
34-
libyaml-devel \
3527
libatomic \
3628
libcurl-devel \
37-
libmnl-devel \
38-
libnetfilter_acct-devel \
39-
libtool \
40-
libuuid-devel \
41-
libuv-devel \
4229
lm_sensors \
4330
lz4-devel \
4431
make \
4532
ninja \
46-
openssl-devel \
4733
openssl-perl \
4834
patch \
4935
pkgconfig \
36+
'pkgconfig(json-c)' \
37+
'pkgconfig(libelf)' \
38+
'pkgconfig(libipmimonitoring)' \
39+
'pkgconfig(libmnl)' \
40+
'pkgconfig(libnetfilter_acct)' \
41+
'pkgconfig(libsystemd)' \
42+
'pkgconfig(libuv)' \
43+
'pkgconfig(liblz4)' \
44+
'pkgconfig(openssl)' \
45+
'pkgconfig(snappy)' \
46+
'pkgconfig(uuid)' \
47+
'pkgconfig(yaml-0.1)' \
48+
'pkgconfig(zlib)' \
5049
procps \
5150
protobuf-c-devel \
5251
protobuf-compiler \
5352
protobuf-devel \
5453
rpm-build \
5554
rpm-devel \
5655
rpmdevtools \
57-
snappy-devel \
58-
systemd-devel \
59-
wget \
60-
zlib-devel && \
56+
wget && \
6157
yum clean all && \
6258
c_rehash && \
6359
mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS

‎package-builders/Dockerfile.debian10‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ ENV DEBIAN_FRONTEND=noninteractive
1515

1616
RUN apt-get update && \
1717
apt-get install -y --no-install-recommends autoconf \
18-
autoconf-archive \
19-
autogen \
20-
automake \
2118
bison \
2219
build-essential \
2320
ca-certificates \
@@ -40,18 +37,17 @@ RUN apt-get update && \
4037
libelf-dev \
4138
libipmimonitoring-dev \
4239
libjson-c-dev \
43-
libyaml-dev \
4440
libjudy-dev \
4541
liblz4-dev \
4642
libmnl-dev \
4743
libnetfilter-acct-dev \
4844
libprotobuf-dev \
4945
libprotoc-dev \
5046
libsnappy-dev \
51-
libsystemd-dev \
5247
libssl-dev \
53-
libtool \
48+
libsystemd-dev \
5449
libuv1-dev \
50+
libyaml-dev \
5551
make \
5652
ninja-build \
5753
pkg-config \

0 commit comments

Comments
 (0)