From 321e1dfee678eeb504f32443d2f09c7517f18878 Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" Date: Tue, 19 Sep 2023 13:17:46 +0300 Subject: [PATCH] Clean up package builders in light of switch to CMake. --- package-builders/Dockerfile.amazonlinux2 | 34 ++++++++---------- package-builders/Dockerfile.amazonlinux2023 | 30 ++++++---------- package-builders/Dockerfile.centos-stream8 | 33 +++++++---------- package-builders/Dockerfile.centos-stream9 | 31 +++++++--------- package-builders/Dockerfile.centos7 | 34 ++++++++---------- package-builders/Dockerfile.debian10 | 8 ++--- package-builders/Dockerfile.debian11 | 10 ++---- package-builders/Dockerfile.debian12 | 10 ++---- package-builders/Dockerfile.fedora37 | 35 ++++++++----------- package-builders/Dockerfile.fedora38 | 35 ++++++++----------- package-builders/Dockerfile.opensuse15.4 | 33 +++++++---------- package-builders/Dockerfile.opensuse15.5 | 33 +++++++---------- .../Dockerfile.opensusetumbleweed | 35 +++++++------------ package-builders/Dockerfile.oraclelinux8 | 30 +++++++--------- package-builders/Dockerfile.oraclelinux9 | 29 +++++++-------- package-builders/Dockerfile.rockylinux8 | 33 +++++++---------- package-builders/Dockerfile.rockylinux9 | 34 +++++++----------- package-builders/Dockerfile.ubuntu20.04 | 4 --- package-builders/Dockerfile.ubuntu22.04 | 4 --- package-builders/Dockerfile.ubuntu23.04 | 4 --- 20 files changed, 188 insertions(+), 311 deletions(-) diff --git a/package-builders/Dockerfile.amazonlinux2 b/package-builders/Dockerfile.amazonlinux2 index 649a022..b6d0d2f 100644 --- a/package-builders/Dockerfile.amazonlinux2 +++ b/package-builders/Dockerfile.amazonlinux2 @@ -9,42 +9,41 @@ LABEL org.opencontainers.image.vendor="Netdata Inc." ENV VERSION=$VERSION RUN yum update -y && \ - yum install -y autoconf \ - autoconf-archive \ - autogen \ - automake \ - bison \ + yum install -y bison \ bison-devel \ cmake \ cups-devel \ curl \ diffutils \ - elfutils-libelf-devel \ findutils \ flex \ flex-devel \ - freeipmi-devel \ gcc \ gcc-c++ \ git-core \ golang \ - json-c-devel \ - libyaml-devel \ libatomic \ libcurl-devel \ - libmnl-devel \ - libnetfilter_acct-devel \ libtool \ - libuuid-devel \ - libuv-devel \ lm_sensors \ - lz4-devel \ make \ ninja \ - openssl-devel \ openssl-perl \ patch \ pkgconfig \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libmnl)' \ + 'pkgconfig(libnetfilter_acct)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(snappy)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ procps \ protobuf-c-devel \ protobuf-compiler \ @@ -52,10 +51,7 @@ RUN yum update -y && \ rpm-build \ rpm-devel \ rpmdevtools \ - snappy-devel \ - systemd-devel \ - wget \ - zlib-devel && \ + wget && \ yum clean all && \ c_rehash && \ mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS diff --git a/package-builders/Dockerfile.amazonlinux2023 b/package-builders/Dockerfile.amazonlinux2023 index 79e5f9a..2874357 100644 --- a/package-builders/Dockerfile.amazonlinux2023 +++ b/package-builders/Dockerfile.amazonlinux2023 @@ -11,16 +11,12 @@ ENV VERSION=$VERSION RUN dnf distro-sync -y --nodocs && \ dnf clean packages && \ dnf install -y --nodocs --allowerasing --setopt=install_weak_deps=False --setopt=diskspacecheck=False \ - autoconf \ - autoconf-archive \ - automake \ bison \ bison-devel \ cmake \ cups-devel \ curl \ diffutils \ - elfutils-libelf-devel \ findutils \ flex \ flex-devel \ @@ -28,25 +24,24 @@ RUN dnf distro-sync -y --nodocs && \ gcc-c++ \ git-core \ golang \ - json-c-devel \ - libyaml-devel \ libatomic \ libcurl-devel \ - libmnl-devel \ - # FIXME: broken / Missing - # XXX: Can't (currently) find an AL2023 package for this :/ - # libnetfilter_acct-devel \ - libtool \ - libuuid-devel \ - libuv-devel \ lm_sensors \ - lz4-devel \ make \ ninja-build \ - openssl-devel \ openssl-perl \ patch \ pkgconfig \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(snappy)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ procps \ protobuf-c-devel \ protobuf-compiler \ @@ -54,10 +49,7 @@ RUN dnf distro-sync -y --nodocs && \ rpm-build \ rpm-devel \ rpmdevtools \ - snappy-devel \ - systemd-devel \ - wget \ - zlib-devel && \ + wget && \ rm -rf /var/cache/dnf && \ c_rehash && \ mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS diff --git a/package-builders/Dockerfile.centos-stream8 b/package-builders/Dockerfile.centos-stream8 index f2551d7..3a8f59b 100644 --- a/package-builders/Dockerfile.centos-stream8 +++ b/package-builders/Dockerfile.centos-stream8 @@ -13,41 +13,37 @@ RUN dnf distro-sync -y --nodocs && \ dnf config-manager --set-enabled powertools && \ dnf clean packages && \ dnf install -y --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \ - autoconf \ - autoconf-archive \ - autogen \ - automake \ - bash \ bison \ cmake \ cups-devel \ curl \ - libcurl-devel \ diffutils \ - elfutils-libelf-devel \ findutils \ flex \ - freeipmi-devel \ gcc \ gcc-c++ \ git \ golang \ - json-c-devel \ libatomic \ - libmnl-devel \ - libtool \ - libuuid-devel \ - libuv-devel \ - libyaml-devel \ + libcurl-devel \ lm_sensors \ - lz4-devel \ make \ ninja-build \ nc \ - openssl-devel \ openssl-perl \ patch \ pkgconfig \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(snappy)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ procps \ protobuf-c-devel \ protobuf-compiler \ @@ -57,10 +53,7 @@ RUN dnf distro-sync -y --nodocs && \ rpm-build \ rpm-devel \ rpmdevtools \ - snappy-devel \ - systemd-devel \ - wget \ - zlib-devel && \ + wget && \ rm -rf /var/cache/dnf && \ c_rehash && \ mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS diff --git a/package-builders/Dockerfile.centos-stream9 b/package-builders/Dockerfile.centos-stream9 index d0e8a76..cccb9d7 100644 --- a/package-builders/Dockerfile.centos-stream9 +++ b/package-builders/Dockerfile.centos-stream9 @@ -13,40 +13,36 @@ RUN dnf distro-sync -y --nodocs && \ dnf config-manager --set-enabled crb && \ dnf clean packages && \ dnf install -y --allowerasing --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \ - autoconf \ - autoconf-archive \ - automake \ - bash \ bison \ cmake \ cups-devel \ curl \ diffutils \ - elfutils-libelf-devel \ findutils \ flex \ - freeipmi-devel \ gcc \ gcc-c++ \ git \ golang \ - json-c-devel \ - libcurl-devel \ - libyaml-devel \ libatomic \ - libmnl-devel \ - libtool \ - libuuid-devel \ - libuv-devel \ lm_sensors \ - lz4-devel \ make \ ninja-build \ nc \ - openssl-devel \ openssl-perl \ patch \ pkgconfig \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(snappy)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ procps \ protobuf-c-devel \ protobuf-compiler \ @@ -56,10 +52,7 @@ RUN dnf distro-sync -y --nodocs && \ rpm-build \ rpm-devel \ rpmdevtools \ - snappy-devel \ - systemd-devel \ - wget \ - zlib-devel && \ + wget && \ rm -rf /var/cache/dnf && \ c_rehash && \ mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS diff --git a/package-builders/Dockerfile.centos7 b/package-builders/Dockerfile.centos7 index 6963e94..2f5f09e 100644 --- a/package-builders/Dockerfile.centos7 +++ b/package-builders/Dockerfile.centos7 @@ -10,43 +10,42 @@ ENV VERSION=$VERSION RUN yum install -y epel-release && \ yum update -y && \ - yum install -y autoconf \ - autoconf-archive \ - autogen \ - automake \ - bash \ + yum install -y bash \ bison \ bison-devel \ cmake \ cups-devel \ curl \ diffutils \ - elfutils-libelf-devel \ findutils \ flex \ flex-devel \ - freeipmi-devel \ gcc \ gcc-c++ \ git-core \ golang \ - json-c-devel \ - libyaml-devel \ libatomic \ libcurl-devel \ - libmnl-devel \ - libnetfilter_acct-devel \ - libtool \ - libuuid-devel \ - libuv-devel \ lm_sensors \ lz4-devel \ make \ ninja \ - openssl-devel \ openssl-perl \ patch \ pkgconfig \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libmnl)' \ + 'pkgconfig(libnetfilter_acct)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(snappy)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ procps \ protobuf-c-devel \ protobuf-compiler \ @@ -54,10 +53,7 @@ RUN yum install -y epel-release && \ rpm-build \ rpm-devel \ rpmdevtools \ - snappy-devel \ - systemd-devel \ - wget \ - zlib-devel && \ + wget && \ yum clean all && \ c_rehash && \ mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS diff --git a/package-builders/Dockerfile.debian10 b/package-builders/Dockerfile.debian10 index 0a3fad2..947bb0a 100644 --- a/package-builders/Dockerfile.debian10 +++ b/package-builders/Dockerfile.debian10 @@ -15,9 +15,6 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y --no-install-recommends autoconf \ - autoconf-archive \ - autogen \ - automake \ bison \ build-essential \ ca-certificates \ @@ -40,7 +37,6 @@ RUN apt-get update && \ libelf-dev \ libipmimonitoring-dev \ libjson-c-dev \ - libyaml-dev \ libjudy-dev \ liblz4-dev \ libmnl-dev \ @@ -48,10 +44,10 @@ RUN apt-get update && \ libprotobuf-dev \ libprotoc-dev \ libsnappy-dev \ - libsystemd-dev \ libssl-dev \ - libtool \ + libsystemd-dev \ libuv1-dev \ + libyaml-dev \ make \ ninja-build \ pkg-config \ diff --git a/package-builders/Dockerfile.debian11 b/package-builders/Dockerfile.debian11 index 9400f20..a11b47f 100644 --- a/package-builders/Dockerfile.debian11 +++ b/package-builders/Dockerfile.debian11 @@ -15,9 +15,6 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y --no-install-recommends autoconf \ - autoconf-archive \ - autogen \ - automake \ bison \ build-essential \ ca-certificates \ @@ -33,13 +30,12 @@ RUN apt-get update && \ git-core \ golang \ libatomic1 \ - libcurl4-openssl-dev\ libcups2-dev \ + libcurl4-openssl-dev\ libdistro-info-perl \ libelf-dev \ libipmimonitoring-dev \ libjson-c-dev \ - libyaml-dev \ libjudy-dev \ liblz4-dev \ libmnl-dev \ @@ -47,10 +43,10 @@ RUN apt-get update && \ libprotobuf-dev \ libprotoc-dev \ libsnappy-dev \ - libsystemd-dev \ libssl-dev \ - libtool \ + libsystemd-dev \ libuv1-dev \ + libyaml-dev \ make \ ninja-build \ pkg-config \ diff --git a/package-builders/Dockerfile.debian12 b/package-builders/Dockerfile.debian12 index df0920b..deb0b39 100644 --- a/package-builders/Dockerfile.debian12 +++ b/package-builders/Dockerfile.debian12 @@ -9,9 +9,6 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y --no-install-recommends autoconf \ - autoconf-archive \ - autogen \ - automake \ bison \ build-essential \ ca-certificates \ @@ -27,13 +24,12 @@ RUN apt-get update && \ git-core \ golang \ libatomic1 \ - libcurl4-openssl-dev\ libcups2-dev \ + libcurl4-openssl-dev\ libdistro-info-perl \ libelf-dev \ libipmimonitoring-dev \ libjson-c-dev \ - libyaml-dev \ libjudy-dev \ liblz4-dev \ libmnl-dev \ @@ -41,10 +37,10 @@ RUN apt-get update && \ libprotobuf-dev \ libprotoc-dev \ libsnappy-dev \ - libsystemd-dev \ libssl-dev \ - libtool \ + libsystemd-dev \ libuv1-dev \ + libyaml-dev \ make \ ninja-build \ pkg-config \ diff --git a/package-builders/Dockerfile.fedora37 b/package-builders/Dockerfile.fedora37 index c4c1dc3..786c140 100644 --- a/package-builders/Dockerfile.fedora37 +++ b/package-builders/Dockerfile.fedora37 @@ -11,41 +11,37 @@ ENV VERSION=$VERSION RUN dnf distro-sync -y --nodocs && \ dnf clean -y packages && \ dnf install -y --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \ - autoconf \ - autoconf-archive \ - autogen \ - automake \ bash \ bison \ cmake \ cups-devel \ curl \ diffutils \ - elfutils-libelf-devel \ findutils \ flex \ - freeipmi-devel \ gcc \ gcc-c++ \ git-core \ golang \ - json-c-devel \ - libcurl-devel \ - libyaml-devel \ - Judy-devel \ libatomic \ - libmnl-devel \ - libnetfilter_acct-devel \ - libtool \ - libuuid-devel \ - libuv-devel \ - lz4-devel \ make \ ninja-build \ - openssl-devel \ openssl-perl \ patch \ pkgconfig \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libmnl)' \ + 'pkgconfig(libnetfilter_acct)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(snappy)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ procps \ protobuf-c-devel \ protobuf-compiler \ @@ -53,10 +49,7 @@ RUN dnf distro-sync -y --nodocs && \ rpm-build \ rpm-devel \ rpmdevtools \ - snappy-devel \ - systemd-devel \ - wget \ - zlib-devel && \ + wget && \ rm -rf /var/cache/dnf && \ c_rehash && \ mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS diff --git a/package-builders/Dockerfile.fedora38 b/package-builders/Dockerfile.fedora38 index f6d546f..d0dcf4d 100644 --- a/package-builders/Dockerfile.fedora38 +++ b/package-builders/Dockerfile.fedora38 @@ -11,41 +11,37 @@ ENV VERSION=$VERSION RUN dnf distro-sync -y --nodocs && \ dnf clean -y packages && \ dnf install -y --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \ - autoconf \ - autoconf-archive \ - autogen \ - automake \ bash \ bison \ cmake \ cups-devel \ curl \ diffutils \ - elfutils-libelf-devel \ findutils \ flex \ - freeipmi-devel \ gcc \ gcc-c++ \ git-core \ golang \ - json-c-devel \ - libyaml-devel \ - Judy-devel \ libatomic \ - libcurl-devel \ - libmnl-devel \ - libnetfilter_acct-devel \ - libtool \ - libuuid-devel \ - libuv-devel \ - lz4-devel \ make \ ninja-build \ - openssl-devel \ openssl-perl \ patch \ pkgconfig \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libmnl)' \ + 'pkgconfig(libnetfilter_acct)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(snappy)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ procps \ protobuf-c-devel \ protobuf-compiler \ @@ -53,10 +49,7 @@ RUN dnf distro-sync -y --nodocs && \ rpm-build \ rpm-devel \ rpmdevtools \ - snappy-devel \ - systemd-devel \ - wget \ - zlib-devel && \ + wget && \ rm -rf /var/cache/dnf && \ c_rehash && \ mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS diff --git a/package-builders/Dockerfile.opensuse15.4 b/package-builders/Dockerfile.opensuse15.4 index f4d86c8..906edd1 100644 --- a/package-builders/Dockerfile.opensuse15.4 +++ b/package-builders/Dockerfile.opensuse15.4 @@ -10,10 +10,6 @@ ENV VERSION=0.1 RUN zypper update -y && \ zypper install -y --allow-downgrade \ - autoconf \ - autoconf-archive \ - autogen \ - automake \ bison \ cmake \ cups \ @@ -21,38 +17,33 @@ RUN zypper update -y && \ curl \ diffutils \ flex \ - freeipmi-devel \ gcc \ gcc-c++ \ git-core \ go \ - json-glib-devel \ - judy-devel \ libatomic1 \ - libcurl-devel \ - libelf-devel \ - liblz4-devel \ - libjson-c-devel \ - libyaml-devel \ - libmnl0 \ - libmnl-devel \ - libnetfilter_acct1 \ - libnetfilter_acct-devel \ - libopenssl-devel \ libprotobuf-c-devel \ - libtool \ - libuv-devel \ - libuuid-devel \ make \ ninja \ patch \ pkg-config \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libmnl)' \ + 'pkgconfig(libnetfilter_acct)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ protobuf-devel \ rpm-build \ rpm-devel \ rpmdevtools \ snappy-devel \ - systemd-devel \ tar \ wget && \ zypper clean && \ diff --git a/package-builders/Dockerfile.opensuse15.5 b/package-builders/Dockerfile.opensuse15.5 index 4397a8c..9a636bf 100644 --- a/package-builders/Dockerfile.opensuse15.5 +++ b/package-builders/Dockerfile.opensuse15.5 @@ -10,10 +10,6 @@ ENV VERSION=0.1 RUN zypper update -y && \ zypper install -y --allow-downgrade \ - autoconf \ - autoconf-archive \ - autogen \ - automake \ bison \ cmake \ cups \ @@ -21,38 +17,33 @@ RUN zypper update -y && \ curl \ diffutils \ flex \ - freeipmi-devel \ gcc \ gcc-c++ \ git-core \ go \ - json-glib-devel \ - judy-devel \ libatomic1 \ - libcurl-devel \ - libelf-devel \ - liblz4-devel \ - libjson-c-devel \ - libyaml-devel \ - libmnl0 \ - libmnl-devel \ - libnetfilter_acct1 \ - libnetfilter_acct-devel \ - libopenssl-devel \ libprotobuf-c-devel \ - libtool \ - libuv-devel \ - libuuid-devel \ make \ ninja \ patch \ pkg-config \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libmnl)' \ + 'pkgconfig(libnetfilter_acct)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ protobuf-devel \ rpm-build \ rpm-devel \ rpmdevtools \ snappy-devel \ - systemd-devel \ tar \ wget && \ zypper clean && \ diff --git a/package-builders/Dockerfile.opensusetumbleweed b/package-builders/Dockerfile.opensusetumbleweed index 64bd360..969ec5c 100644 --- a/package-builders/Dockerfile.opensusetumbleweed +++ b/package-builders/Dockerfile.opensusetumbleweed @@ -10,10 +10,6 @@ ENV VERSION=$VERSION RUN zypper update -y && \ zypper install -y --allow-downgrade \ - autoconf \ - autoconf-archive \ - autogen \ - automake \ bison \ cmake \ cups \ @@ -21,38 +17,33 @@ RUN zypper update -y && \ curl \ diffutils \ flex \ - freeipmi-devel \ gcc \ gcc-c++ \ git-core \ go \ - json-glib-devel \ - judy-devel \ libatomic1 \ - libcurl-devel \ - libelf-devel \ - liblz4-devel \ - libjson-c-devel \ - libyaml-devel \ - libmnl0 \ - libmnl-devel \ - libnetfilter_acct1 \ - libnetfilter_acct-devel \ - libopenssl-devel \ - libtool \ - libuv-devel \ - libuuid-devel \ make \ ninja \ patch \ pkg-config \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libmnl)' \ + 'pkgconfig(libnetfilter_acct)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(snappy)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ protobuf-c \ protobuf-devel \ rpm-build \ rpm-devel \ rpmdevtools \ - snappy-devel \ - systemd-devel \ tar \ wget && \ zypper clean && \ diff --git a/package-builders/Dockerfile.oraclelinux8 b/package-builders/Dockerfile.oraclelinux8 index 082ae03..33b920e 100644 --- a/package-builders/Dockerfile.oraclelinux8 +++ b/package-builders/Dockerfile.oraclelinux8 @@ -12,10 +12,6 @@ RUN dnf config-manager --set-enabled ol8_codeready_builder && \ dnf distro-sync -y --nodocs && \ dnf clean packages && \ dnf install -y --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \ - autoconf \ - autoconf-archive \ - autogen \ - automake \ bash \ bison \ cmake \ @@ -23,30 +19,31 @@ RUN dnf config-manager --set-enabled ol8_codeready_builder && \ curl \ libcurl-devel \ diffutils \ - elfutils-libelf-devel \ findutils \ flex \ - freeipmi-devel \ gcc \ gcc-c++ \ git \ golang \ - json-c-devel \ - libyaml-devel \ libatomic \ - libmnl-devel \ - libtool \ - libuuid-devel \ - libuv-devel \ lm_sensors \ - lz4-devel \ make \ nc \ ninja-build \ - openssl-devel \ openssl-perl \ patch \ pkgconfig \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(snappy)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ procps \ protobuf-c-devel \ protobuf-compiler \ @@ -56,10 +53,7 @@ RUN dnf config-manager --set-enabled ol8_codeready_builder && \ rpm-build \ rpm-devel \ rpmdevtools \ - snappy-devel \ - systemd-devel \ - wget \ - zlib-devel && \ + wget && \ rm -rf /var/cache/dnf && \ c_rehash && \ mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS diff --git a/package-builders/Dockerfile.oraclelinux9 b/package-builders/Dockerfile.oraclelinux9 index 351ef28..683774e 100644 --- a/package-builders/Dockerfile.oraclelinux9 +++ b/package-builders/Dockerfile.oraclelinux9 @@ -12,40 +12,38 @@ RUN dnf config-manager --set-enabled ol9_codeready_builder && \ dnf distro-sync -y --nodocs && \ dnf clean packages && \ dnf install -y --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \ - autoconf \ - autoconf-archive \ - automake \ bash \ bison \ cmake \ cups-devel \ curl \ diffutils \ - elfutils-libelf-devel \ findutils \ flex \ - freeipmi-devel \ gcc \ gcc-c++ \ git \ golang \ - json-c-devel \ libcurl-devel \ - libyaml-devel \ libatomic \ - libmnl-devel \ - libtool \ - libuuid-devel \ - libuv-devel \ lm_sensors \ - lz4-devel \ make \ nc \ ninja-build \ - openssl-devel \ openssl-perl \ patch \ pkgconfig \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(snappy)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ procps \ protobuf-c-devel \ protobuf-compiler \ @@ -55,10 +53,7 @@ RUN dnf config-manager --set-enabled ol9_codeready_builder && \ rpm-build \ rpm-devel \ rpmdevtools \ - snappy-devel \ - systemd-devel \ - wget \ - zlib-devel && \ + wget && \ rm -rf /var/cache/dnf && \ c_rehash && \ mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS diff --git a/package-builders/Dockerfile.rockylinux8 b/package-builders/Dockerfile.rockylinux8 index 80ab911..6f6faf7 100644 --- a/package-builders/Dockerfile.rockylinux8 +++ b/package-builders/Dockerfile.rockylinux8 @@ -13,10 +13,6 @@ RUN dnf distro-sync -y --nodocs && \ dnf config-manager --set-enabled powertools && \ dnf clean packages && \ dnf install -y --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \ - autoconf \ - autoconf-archive \ - autogen \ - automake \ bash \ bison \ cmake \ @@ -24,33 +20,31 @@ RUN dnf distro-sync -y --nodocs && \ curl \ libcurl-devel \ diffutils \ - elfutils-libelf-devel \ findutils \ flex \ - freeipmi-devel \ gcc \ gcc-c++ \ git \ golang \ - json-c-devel \ libatomic \ - libmnl-devel \ - # FIXME: broken / Missing - # XXX: Can't (currently) find a CentOS 8 package for this :/ - #libnetfilter_acct-devel \ - libtool \ - libuuid-devel \ - libuv-devel \ - libyaml-devel \ lm_sensors \ - lz4-devel \ make \ nc \ ninja-build \ - openssl-devel \ openssl-perl \ patch \ pkgconfig \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(snappy)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ procps \ protobuf-c-devel \ protobuf-compiler \ @@ -60,10 +54,7 @@ RUN dnf distro-sync -y --nodocs && \ rpm-build \ rpm-devel \ rpmdevtools \ - snappy-devel \ - systemd-devel \ - wget \ - zlib-devel && \ + wget && \ rm -rf /var/cache/dnf && \ c_rehash && \ mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS diff --git a/package-builders/Dockerfile.rockylinux9 b/package-builders/Dockerfile.rockylinux9 index ededd9f..45616d5 100644 --- a/package-builders/Dockerfile.rockylinux9 +++ b/package-builders/Dockerfile.rockylinux9 @@ -13,43 +13,38 @@ RUN dnf distro-sync -y --nodocs && \ dnf config-manager --set-enabled crb && \ dnf clean packages && \ dnf install -y --allowerasing --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \ - autoconf \ - autoconf-archive \ - automake \ bash \ bison \ cmake \ cups-devel \ curl \ + libcurl-devel \ diffutils \ - elfutils-libelf-devel \ findutils \ flex \ - freeipmi-devel \ gcc \ gcc-c++ \ git \ golang \ - json-c-devel \ - libcurl-devel \ - libyaml-devel \ libatomic \ - libmnl-devel \ - # FIXME: broken / Missing - # XXX: Can't (currently) find a CentOS 8 package for this :/ - #libnetfilter_acct-devel \ - libtool \ - libuuid-devel \ - libuv-devel \ lm_sensors \ - lz4-devel \ make \ nc \ ninja-build \ - openssl-devel \ openssl-perl \ patch \ pkgconfig \ + 'pkgconfig(json-c)' \ + 'pkgconfig(libelf)' \ + 'pkgconfig(libipmimonitoring)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libuv)' \ + 'pkgconfig(liblz4)' \ + 'pkgconfig(openssl)' \ + 'pkgconfig(snappy)' \ + 'pkgconfig(uuid)' \ + 'pkgconfig(yaml-0.1)' \ + 'pkgconfig(zlib)' \ procps \ protobuf-c-devel \ protobuf-compiler \ @@ -59,10 +54,7 @@ RUN dnf distro-sync -y --nodocs && \ rpm-build \ rpm-devel \ rpmdevtools \ - snappy-devel \ - systemd-devel \ - wget \ - zlib-devel && \ + wget && \ rm -rf /var/cache/dnf && \ c_rehash && \ mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS diff --git a/package-builders/Dockerfile.ubuntu20.04 b/package-builders/Dockerfile.ubuntu20.04 index 4265b29..8701dfa 100644 --- a/package-builders/Dockerfile.ubuntu20.04 +++ b/package-builders/Dockerfile.ubuntu20.04 @@ -15,9 +15,6 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y --no-install-recommends autoconf \ - autoconf-archive \ - autogen \ - automake \ bison \ build-essential \ ca-certificates \ @@ -50,7 +47,6 @@ RUN apt-get update && \ libsnappy-dev \ libsystemd-dev \ libssl-dev \ - libtool \ libuv1-dev \ make \ ninja-build \ diff --git a/package-builders/Dockerfile.ubuntu22.04 b/package-builders/Dockerfile.ubuntu22.04 index 2cf630e..4d0b352 100644 --- a/package-builders/Dockerfile.ubuntu22.04 +++ b/package-builders/Dockerfile.ubuntu22.04 @@ -15,9 +15,6 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y --no-install-recommends autoconf \ - autoconf-archive \ - autogen \ - automake \ bison \ build-essential \ ca-certificates \ @@ -49,7 +46,6 @@ RUN apt-get update && \ libsnappy-dev \ libsystemd-dev \ libssl-dev \ - libtool \ libuv1-dev \ make \ ninja-build \ diff --git a/package-builders/Dockerfile.ubuntu23.04 b/package-builders/Dockerfile.ubuntu23.04 index a72cb4f..749b8d1 100644 --- a/package-builders/Dockerfile.ubuntu23.04 +++ b/package-builders/Dockerfile.ubuntu23.04 @@ -15,9 +15,6 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y --no-install-recommends autoconf \ - autoconf-archive \ - autogen \ - automake \ bison \ build-essential \ ca-certificates \ @@ -49,7 +46,6 @@ RUN apt-get update && \ libsnappy-dev \ libsystemd-dev \ libssl-dev \ - libtool \ libuv1-dev \ make \ ninja-build \