diff --git a/builder/Dockerfile b/builder/Dockerfile index 6887590..84aef08 100644 --- a/builder/Dockerfile +++ b/builder/Dockerfile @@ -33,10 +33,12 @@ RUN apk --no-cache add alpine-sdk \ libuv-dev \ lm_sensors \ lz4-dev \ + make \ mariadb-dev \ mongo-c-driver-dev \ musl-dev \ musl-fts-dev \ + ninja \ netcat-openbsd \ openssl-dev \ pkgconfig \ diff --git a/package-builders/Dockerfile.amazonlinux2 b/package-builders/Dockerfile.amazonlinux2 index 1628575..649a022 100644 --- a/package-builders/Dockerfile.amazonlinux2 +++ b/package-builders/Dockerfile.amazonlinux2 @@ -40,6 +40,7 @@ RUN yum update -y && \ lm_sensors \ lz4-devel \ make \ + ninja \ openssl-devel \ openssl-perl \ patch \ diff --git a/package-builders/Dockerfile.amazonlinux2023 b/package-builders/Dockerfile.amazonlinux2023 index 9ca4d14..79e5f9a 100644 --- a/package-builders/Dockerfile.amazonlinux2023 +++ b/package-builders/Dockerfile.amazonlinux2023 @@ -42,6 +42,7 @@ RUN dnf distro-sync -y --nodocs && \ lm_sensors \ lz4-devel \ make \ + ninja-build \ openssl-devel \ openssl-perl \ patch \ diff --git a/package-builders/Dockerfile.centos-stream8 b/package-builders/Dockerfile.centos-stream8 index 0dd28ca..f2551d7 100644 --- a/package-builders/Dockerfile.centos-stream8 +++ b/package-builders/Dockerfile.centos-stream8 @@ -42,6 +42,7 @@ RUN dnf distro-sync -y --nodocs && \ lm_sensors \ lz4-devel \ make \ + ninja-build \ nc \ openssl-devel \ openssl-perl \ diff --git a/package-builders/Dockerfile.centos-stream9 b/package-builders/Dockerfile.centos-stream9 index 1b6584a..d0e8a76 100644 --- a/package-builders/Dockerfile.centos-stream9 +++ b/package-builders/Dockerfile.centos-stream9 @@ -41,6 +41,7 @@ RUN dnf distro-sync -y --nodocs && \ lm_sensors \ lz4-devel \ make \ + ninja-build \ nc \ openssl-devel \ openssl-perl \ diff --git a/package-builders/Dockerfile.centos7 b/package-builders/Dockerfile.centos7 index d77be9a..6963e94 100644 --- a/package-builders/Dockerfile.centos7 +++ b/package-builders/Dockerfile.centos7 @@ -42,6 +42,7 @@ RUN yum install -y epel-release && \ lm_sensors \ lz4-devel \ make \ + ninja \ openssl-devel \ openssl-perl \ patch \ diff --git a/package-builders/Dockerfile.debian10 b/package-builders/Dockerfile.debian10 index ce6ad76..0a3fad2 100644 --- a/package-builders/Dockerfile.debian10 +++ b/package-builders/Dockerfile.debian10 @@ -53,6 +53,7 @@ RUN apt-get update && \ libtool \ libuv1-dev \ make \ + ninja-build \ pkg-config \ protobuf-compiler \ systemd \ diff --git a/package-builders/Dockerfile.debian11 b/package-builders/Dockerfile.debian11 index 2a9cdd3..9400f20 100644 --- a/package-builders/Dockerfile.debian11 +++ b/package-builders/Dockerfile.debian11 @@ -52,6 +52,7 @@ RUN apt-get update && \ libtool \ libuv1-dev \ make \ + ninja-build \ pkg-config \ protobuf-compiler \ systemd \ diff --git a/package-builders/Dockerfile.debian12 b/package-builders/Dockerfile.debian12 index bb04289..df0920b 100644 --- a/package-builders/Dockerfile.debian12 +++ b/package-builders/Dockerfile.debian12 @@ -46,6 +46,7 @@ RUN apt-get update && \ libtool \ libuv1-dev \ make \ + ninja-build \ pkg-config \ protobuf-compiler \ systemd \ diff --git a/package-builders/Dockerfile.fedora37 b/package-builders/Dockerfile.fedora37 index ad8172a..c4c1dc3 100644 --- a/package-builders/Dockerfile.fedora37 +++ b/package-builders/Dockerfile.fedora37 @@ -41,6 +41,7 @@ RUN dnf distro-sync -y --nodocs && \ libuv-devel \ lz4-devel \ make \ + ninja-build \ openssl-devel \ openssl-perl \ patch \ diff --git a/package-builders/Dockerfile.fedora38 b/package-builders/Dockerfile.fedora38 index b670276..f6d546f 100644 --- a/package-builders/Dockerfile.fedora38 +++ b/package-builders/Dockerfile.fedora38 @@ -41,6 +41,7 @@ RUN dnf distro-sync -y --nodocs && \ libuv-devel \ lz4-devel \ make \ + ninja-build \ openssl-devel \ openssl-perl \ patch \ diff --git a/package-builders/Dockerfile.opensuse15.4 b/package-builders/Dockerfile.opensuse15.4 index a776a36..f4d86c8 100644 --- a/package-builders/Dockerfile.opensuse15.4 +++ b/package-builders/Dockerfile.opensuse15.4 @@ -44,6 +44,7 @@ RUN zypper update -y && \ libuv-devel \ libuuid-devel \ make \ + ninja \ patch \ pkg-config \ protobuf-devel \ diff --git a/package-builders/Dockerfile.opensuse15.5 b/package-builders/Dockerfile.opensuse15.5 index c5c5291..4397a8c 100644 --- a/package-builders/Dockerfile.opensuse15.5 +++ b/package-builders/Dockerfile.opensuse15.5 @@ -44,6 +44,7 @@ RUN zypper update -y && \ libuv-devel \ libuuid-devel \ make \ + ninja \ patch \ pkg-config \ protobuf-devel \ diff --git a/package-builders/Dockerfile.opensusetumbleweed b/package-builders/Dockerfile.opensusetumbleweed index 58806d2..64bd360 100644 --- a/package-builders/Dockerfile.opensusetumbleweed +++ b/package-builders/Dockerfile.opensusetumbleweed @@ -43,6 +43,7 @@ RUN zypper update -y && \ libuv-devel \ libuuid-devel \ make \ + ninja \ patch \ pkg-config \ protobuf-c \ diff --git a/package-builders/Dockerfile.oraclelinux8 b/package-builders/Dockerfile.oraclelinux8 index e1b5dc5..082ae03 100644 --- a/package-builders/Dockerfile.oraclelinux8 +++ b/package-builders/Dockerfile.oraclelinux8 @@ -8,9 +8,8 @@ LABEL org.opencontainers.image.vendor="Netdata Inc." ENV VERSION=$VERSION -COPY package-builders/oraclelinux8-codeready.repo /etc/yum.repos.d/codeready_builder.repo - -RUN dnf distro-sync -y --nodocs && \ +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 \ @@ -43,6 +42,7 @@ RUN dnf distro-sync -y --nodocs && \ lz4-devel \ make \ nc \ + ninja-build \ openssl-devel \ openssl-perl \ patch \ diff --git a/package-builders/Dockerfile.oraclelinux9 b/package-builders/Dockerfile.oraclelinux9 index 5719db9..351ef28 100644 --- a/package-builders/Dockerfile.oraclelinux9 +++ b/package-builders/Dockerfile.oraclelinux9 @@ -41,6 +41,7 @@ RUN dnf config-manager --set-enabled ol9_codeready_builder && \ lz4-devel \ make \ nc \ + ninja-build \ openssl-devel \ openssl-perl \ patch \ diff --git a/package-builders/Dockerfile.rockylinux8 b/package-builders/Dockerfile.rockylinux8 index 4305d0f..80ab911 100644 --- a/package-builders/Dockerfile.rockylinux8 +++ b/package-builders/Dockerfile.rockylinux8 @@ -46,6 +46,7 @@ RUN dnf distro-sync -y --nodocs && \ lz4-devel \ make \ nc \ + ninja-build \ openssl-devel \ openssl-perl \ patch \ diff --git a/package-builders/Dockerfile.rockylinux9 b/package-builders/Dockerfile.rockylinux9 index 28053a5..ededd9f 100644 --- a/package-builders/Dockerfile.rockylinux9 +++ b/package-builders/Dockerfile.rockylinux9 @@ -45,6 +45,7 @@ RUN dnf distro-sync -y --nodocs && \ lz4-devel \ make \ nc \ + ninja-build \ openssl-devel \ openssl-perl \ patch \ diff --git a/package-builders/Dockerfile.ubuntu20.04 b/package-builders/Dockerfile.ubuntu20.04 index a016f7e..4265b29 100644 --- a/package-builders/Dockerfile.ubuntu20.04 +++ b/package-builders/Dockerfile.ubuntu20.04 @@ -53,6 +53,7 @@ RUN apt-get update && \ libtool \ libuv1-dev \ make \ + ninja-build \ pkg-config \ protobuf-compiler \ systemd \ diff --git a/package-builders/Dockerfile.ubuntu22.04 b/package-builders/Dockerfile.ubuntu22.04 index bb0c950..2cf630e 100644 --- a/package-builders/Dockerfile.ubuntu22.04 +++ b/package-builders/Dockerfile.ubuntu22.04 @@ -52,6 +52,7 @@ RUN apt-get update && \ libtool \ libuv1-dev \ make \ + ninja-build \ pkg-config \ protobuf-compiler \ systemd \ diff --git a/package-builders/Dockerfile.ubuntu23.04 b/package-builders/Dockerfile.ubuntu23.04 index 4caa747..a72cb4f 100644 --- a/package-builders/Dockerfile.ubuntu23.04 +++ b/package-builders/Dockerfile.ubuntu23.04 @@ -52,6 +52,7 @@ RUN apt-get update && \ libtool \ libuv1-dev \ make \ + ninja-build \ pkg-config \ protobuf-compiler \ systemd \ diff --git a/package-builders/oraclelinux8-codeready.repo b/package-builders/oraclelinux8-codeready.repo deleted file mode 100644 index 85a27f1..0000000 --- a/package-builders/oraclelinux8-codeready.repo +++ /dev/null @@ -1,6 +0,0 @@ -[ol8_codeready_builder] -name=Oracle Linux $releasever CodeReady Builder ($basearch) -baseurl=http://yum.oracle.com/repo/OracleLinux/OL8/codeready/builder/$basearch -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle -gpgcheck=1 -enabled=1 diff --git a/static-builder/Dockerfile b/static-builder/Dockerfile index 708b584..78c1691 100644 --- a/static-builder/Dockerfile +++ b/static-builder/Dockerfile @@ -37,6 +37,7 @@ RUN apk add --no-cache \ musl-fts-dev \ ncurses \ netcat-openbsd \ + ninja \ openssh \ pkgconfig \ protobuf-dev \