From 77fd9d883f41970ea7d2e68ff0c214c2f744160b Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Thu, 22 Aug 2024 15:15:15 +0900 Subject: [PATCH 1/2] Backport: gzip zstd snappy build dependency See https://github.com/fluent/fluentd-kubernetes-daemonset/pull/1524 Signed-off-by: Kentaro Hayashi --- Makefile | 8 ++++---- templates/Dockerfile.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 95cf23e3e..3fe8d576c 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,8 @@ X86_IMAGES := \ v1.16/debian-graylog:v1.16.6-debian-graylog-amd64-1.0,v1.16-debian-graylog-amd64-2 \ v1.16/debian-papertrail:v1.16.6-debian-papertrail-amd64-1.0,v1.16-debian-papertrail-amd64-2 \ v1.16/debian-logzio:v1.16.6-debian-logzio-amd64-1.0,v1.16-debian-logzio-amd64-2 \ - v1.16/debian-kafka:v1.16.6-debian-kafka-amd64-1.0,v1.16-debian-kafka-amd64-2 \ - v1.16/debian-kafka2:v1.16.6-debian-kafka2-amd64-1.0,v1.16-debian-kafka2-amd64-2 \ + v1.16/debian-kafka:v1.16.6-debian-kafka-amd64-1.1,v1.16-debian-kafka-amd64-2 \ + v1.16/debian-kafka2:v1.16.6-debian-kafka2-amd64-1.1,v1.16-debian-kafka2-amd64-2 \ v1.16/debian-kinesis:v1.16.6-debian-kinesis-amd64-1.0,v1.16-debian-kinesis-amd64-2 # :,,,... @@ -47,8 +47,8 @@ ARM64_IMAGES := \ v1.16/arm64/debian-graylog:v1.16.6-debian-graylog-arm64-1.0,v1.16-debian-graylog-arm64-2 \ v1.16/arm64/debian-papertrail:v1.16.6-debian-papertrail-arm64-1.0,v1.16-debian-papertrail-arm64-2 \ v1.16/arm64/debian-logzio:v1.16.6-debian-logzio-arm64-1.0,v1.16-debian-logzio-arm64-2 \ - v1.16/arm64/debian-kafka:v1.16.6-debian-kafka-arm64-1.0,v1.16-debian-kafka-arm64-2 \ - v1.16/arm64/debian-kafka2:v1.16.6-debian-kafka2-arm64-1.0,v1.16-debian-kafka2-arm64-2 \ + v1.16/arm64/debian-kafka:v1.16.6-debian-kafka-arm64-1.1,v1.16-debian-kafka-arm64-2 \ + v1.16/arm64/debian-kafka2:v1.16.6-debian-kafka2-arm64-1.1,v1.16-debian-kafka2-arm64-2 \ v1.16/arm64/debian-kinesis:v1.16.6-debian-kinesis-arm64-1.0,v1.16-debian-kinesis-arm64-2 ALL_IMAGES := $(X86_IMAGES) $(ARM64_IMAGES) diff --git a/templates/Dockerfile.erb b/templates/Dockerfile.erb index f0b8968ed..c7014b4b7 100644 --- a/templates/Dockerfile.erb +++ b/templates/Dockerfile.erb @@ -29,7 +29,7 @@ ENV GEM_HOME /fluentd/vendor/bundle/ruby/<%= ruby_version %>.0 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1 COPY Gemfile* /fluentd/ -RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev<% if target == "graylog" %> build-essential patch zlib1g-dev liblzma-dev<% elsif target == "kafka" || target == "kafka2" %> build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev<% elsif target == "s3" %> curl<% end %><% if requires_git %> git<% end %>" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev<% if target == "graylog" %> build-essential patch zlib1g-dev liblzma-dev<% elsif target == "kafka" || target == "kafka2" %> build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev zlib1g-dev libzstd-dev libsnappy-dev<% elsif target == "s3" %> curl<% end %><% if requires_git %> git<% end %>" \ runtimeDeps="<% if target == "kafka" || target == "kafka2" %>krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2<% elsif target == "azureblob" %>pkg-config libxslt-dev libxml2-dev<% end %>" \ <% if target == "kafka" || target == "kafka2" %> && export DEBIAN_FRONTEND=noninteractive <% end %> && apt-get update \ && apt-get upgrade -y \ From 49e6793d568101dc00c2b7628c4f895a70311699 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Thu, 22 Aug 2024 15:23:24 +0900 Subject: [PATCH 2/2] Add v1.16.6-1.1 images for kafka,kafka2 Signed-off-by: Kentaro Hayashi --- README.md | 12 ++++++------ docker-image/v1.16/arm64/debian-kafka/Dockerfile | 2 +- docker-image/v1.16/arm64/debian-kafka/Gemfile.lock | 2 +- .../v1.16/arm64/debian-kafka/hooks/post_push | 2 +- docker-image/v1.16/arm64/debian-kafka2/Dockerfile | 2 +- docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock | 2 +- .../v1.16/arm64/debian-kafka2/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka/Dockerfile | 2 +- docker-image/v1.16/debian-kafka/Gemfile.lock | 2 +- docker-image/v1.16/debian-kafka/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka2/Dockerfile | 2 +- docker-image/v1.16/debian-kafka2/Gemfile.lock | 2 +- docker-image/v1.16/debian-kafka2/hooks/post_push | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 57e4a86c7..3ac3f9292 100644 --- a/README.md +++ b/README.md @@ -50,10 +50,10 @@ If you want to use above non published images, build it by yourself. Dockerfile - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-2` - `Kafka` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-2` - `Kafka2` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-2` - `Kinesis` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-1.0` @@ -100,10 +100,10 @@ If you want to use above non published images, build it by yourself. Dockerfile - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logzio-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-logzio-amd64-2` - `Kafka` [Dockerfile](docker-image/v1.16/debian-kafka/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-amd64-2` - `Kafka2` [Dockerfile](docker-image/v1.16/debian-kafka2/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-amd64-2` - `Kinesis` [Dockerfile](docker-image/v1.16/debian-kinesis/Dockerfile) - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-amd64-1.0` @@ -142,10 +142,10 @@ If you want to use above non published images, build it by yourself. Dockerfile - `Papertrail` [Dockerfile](docker-image/v1.16/arm64/debian-papertrail/Dockerfile) - `Logzio` [Dockerfile](docker-image/v1.16/arm64/debian-logzio/Dockerfile) - `Kafka` [Dockerfile](docker-image/v1.16/arm64/debian-kafka/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-arm64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-arm64-2` - `Kafka2` [Dockerfile](docker-image/v1.16/arm64/debian-kafka2/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-arm64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-arm64-2` - `Kinesis` [Dockerfile](docker-image/v1.16/arm64/debian-kinesis/Dockerfile) - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-arm64-1.0` diff --git a/docker-image/v1.16/arm64/debian-kafka/Dockerfile b/docker-image/v1.16/arm64/debian-kafka/Dockerfile index 95386b18f..728a5d443 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Dockerfile +++ b/docker-image/v1.16/arm64/debian-kafka/Dockerfile @@ -21,7 +21,7 @@ ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.2.0 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1 COPY Gemfile* /fluentd/ -RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev zlib1g-dev libzstd-dev libsnappy-dev" \ runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2" \ && export DEBIAN_FRONTEND=noninteractive && apt-get update \ && apt-get upgrade -y \ diff --git a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock index a565401db..523f5254c 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock @@ -102,7 +102,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0820) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) diff --git a/docker-image/v1.16/arm64/debian-kafka/hooks/post_push b/docker-image/v1.16/arm64/debian-kafka/hooks/post_push index 669f09bf0..6f684b476 100644 --- a/docker-image/v1.16/arm64/debian-kafka/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-kafka/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-kafka-arm64-1.0,v1.16-debian-kafka-arm64-2}; do +for tag in {v1.16.6-debian-kafka-arm64-1.1,v1.16-debian-kafka-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-kafka2/Dockerfile b/docker-image/v1.16/arm64/debian-kafka2/Dockerfile index 95386b18f..728a5d443 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Dockerfile +++ b/docker-image/v1.16/arm64/debian-kafka2/Dockerfile @@ -21,7 +21,7 @@ ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.2.0 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1 COPY Gemfile* /fluentd/ -RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev zlib1g-dev libzstd-dev libsnappy-dev" \ runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2" \ && export DEBIAN_FRONTEND=noninteractive && apt-get update \ && apt-get upgrade -y \ diff --git a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock index a565401db..523f5254c 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock @@ -102,7 +102,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0820) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) diff --git a/docker-image/v1.16/arm64/debian-kafka2/hooks/post_push b/docker-image/v1.16/arm64/debian-kafka2/hooks/post_push index 47172cfe3..9dbcb5d9a 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-kafka2/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-kafka2-arm64-1.0,v1.16-debian-kafka2-arm64-2}; do +for tag in {v1.16.6-debian-kafka2-arm64-1.1,v1.16-debian-kafka2-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-kafka/Dockerfile b/docker-image/v1.16/debian-kafka/Dockerfile index 83f1b8d15..f72e31b59 100644 --- a/docker-image/v1.16/debian-kafka/Dockerfile +++ b/docker-image/v1.16/debian-kafka/Dockerfile @@ -13,7 +13,7 @@ ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.2.0 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1 COPY Gemfile* /fluentd/ -RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev zlib1g-dev libzstd-dev libsnappy-dev" \ runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2" \ && export DEBIAN_FRONTEND=noninteractive && apt-get update \ && apt-get upgrade -y \ diff --git a/docker-image/v1.16/debian-kafka/Gemfile.lock b/docker-image/v1.16/debian-kafka/Gemfile.lock index a565401db..523f5254c 100644 --- a/docker-image/v1.16/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka/Gemfile.lock @@ -102,7 +102,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0820) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) diff --git a/docker-image/v1.16/debian-kafka/hooks/post_push b/docker-image/v1.16/debian-kafka/hooks/post_push index 321dbab32..1e339304f 100644 --- a/docker-image/v1.16/debian-kafka/hooks/post_push +++ b/docker-image/v1.16/debian-kafka/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-kafka-amd64-1.0,v1.16-debian-kafka-amd64-2}; do +for tag in {v1.16.6-debian-kafka-amd64-1.1,v1.16-debian-kafka-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-kafka2/Dockerfile b/docker-image/v1.16/debian-kafka2/Dockerfile index 83f1b8d15..f72e31b59 100644 --- a/docker-image/v1.16/debian-kafka2/Dockerfile +++ b/docker-image/v1.16/debian-kafka2/Dockerfile @@ -13,7 +13,7 @@ ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.2.0 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1 COPY Gemfile* /fluentd/ -RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev zlib1g-dev libzstd-dev libsnappy-dev" \ runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2" \ && export DEBIAN_FRONTEND=noninteractive && apt-get update \ && apt-get upgrade -y \ diff --git a/docker-image/v1.16/debian-kafka2/Gemfile.lock b/docker-image/v1.16/debian-kafka2/Gemfile.lock index a565401db..523f5254c 100644 --- a/docker-image/v1.16/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka2/Gemfile.lock @@ -102,7 +102,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0820) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) diff --git a/docker-image/v1.16/debian-kafka2/hooks/post_push b/docker-image/v1.16/debian-kafka2/hooks/post_push index 64d726572..4440c3f0e 100644 --- a/docker-image/v1.16/debian-kafka2/hooks/post_push +++ b/docker-image/v1.16/debian-kafka2/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-kafka2-amd64-1.0,v1.16-debian-kafka2-amd64-2}; do +for tag in {v1.16.6-debian-kafka2-amd64-1.1,v1.16-debian-kafka2-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed