From 92df045557f5f9f308f09a714dc6587781f2343f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Nov=C3=A1k?= Date: Tue, 26 Nov 2024 03:06:41 +0100 Subject: [PATCH] feat: add rdkafka gem installation to Dockerfiles for fluent-watcher (#1415) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add rdkafka gem installation to Dockerfiles for fluent-watcher Signed-off-by: Tomáš Novák * feat: add rdkafka build dependencies Signed-off-by: Tomáš Novák --------- Signed-off-by: Tomáš Novák --- cmd/fluent-watcher/fluentd/Dockerfile.amd64 | 3 +++ cmd/fluent-watcher/fluentd/Dockerfile.arm64 | 5 +++-- cmd/fluent-watcher/fluentd/Dockerfile.arm64.base | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.amd64 b/cmd/fluent-watcher/fluentd/Dockerfile.amd64 index 43bc57b59..11e6d7f4e 100644 --- a/cmd/fluent-watcher/fluentd/Dockerfile.amd64 +++ b/cmd/fluent-watcher/fluentd/Dockerfile.amd64 @@ -22,6 +22,8 @@ RUN apk update \ && apk add --no-cache --virtual .build-deps \ build-base linux-headers \ ruby-dev gnupg \ + bash \ + openssl-dev \ && echo 'gem: --no-document' >> /etc/gemrc \ && gem install oj -v 3.13.22 \ && gem install json -v 2.6.2 \ @@ -35,6 +37,7 @@ RUN apk update \ && gem install elasticsearch -v 7.13.3 \ && gem install elasticsearch-xpack -v 7.13.3 \ && gem install fluent-plugin-detect-exceptions -v 0.0.14 \ + && gem install rdkafka -v 0.19.0 \ && gem install \ fluent-plugin-s3 \ fluent-plugin-grok-parser \ diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64 b/cmd/fluent-watcher/fluentd/Dockerfile.arm64 index 4fae38175..6a315d68e 100644 --- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64 +++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64 @@ -28,7 +28,7 @@ RUN apt-get update \ ca-certificates \ && buildDeps=" \ make gcc g++ libc-dev \ - wget bzip2 gnupg dirmngr \ + wget bzip2 gnupg dirmngr bash openssl build-essential \ " \ && apt-get install -y --no-install-recommends $buildDeps \ && echo 'gem: --no-document' >> /etc/gemrc \ @@ -43,6 +43,7 @@ RUN apt-get update \ && gem install elasticsearch -v 7.13.3 \ && gem install elasticsearch-xpack -v 7.13.3 \ && gem install fluent-plugin-detect-exceptions -v 0.0.14 \ + && gem install rdkafka -v 0.19.0 \ && gem install \ fluent-plugin-s3 \ fluent-plugin-grok-parser \ @@ -63,7 +64,7 @@ RUN apt-get update \ && cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \ && ./configure && make \ && mv lib/libjemalloc.so.2 /usr/lib \ - && apt-get purge -y --auto-remove \ + && apt-get purge -y --allow-remove-essential --auto-remove \ -o APT::AutoRemove::RecommendsImportant=false \ $buildDeps \ && rm -rf /var/lib/apt/lists/* \ diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base index aaa229c40..b98a18649 100644 --- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base +++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base @@ -19,7 +19,7 @@ RUN apt-get update \ ca-certificates \ && buildDeps=" \ make gcc g++ libc-dev \ - wget bzip2 gnupg dirmngr\ + wget bzip2 gnupg dirmngr bash openssl build-essential \ " \ && apt-get install -y --no-install-recommends $buildDeps \ && echo 'gem: --no-document' >> /etc/gemrc \ @@ -33,6 +33,7 @@ RUN apt-get update \ && gem install elasticsearch -v 7.13.3 \ && gem install elasticsearch-xpack -v 7.13.3 \ && gem install fluent-plugin-detect-exceptions -v 0.0.14 \ + && gem install rdkafka -v 0.19.0 \ && gem install \ fluent-plugin-s3 \ fluent-plugin-grok-parser \ @@ -52,4 +53,4 @@ RUN apt-get update \ && cd /tmp && tar -xjf jemalloc-4.5.0.tar.bz2 && cd jemalloc-4.5.0/ \ && ./configure && make \ && mv lib/libjemalloc.so.2 /usr/lib \ - && echo "plugins installed." \ No newline at end of file + && echo "plugins installed."