From c66ef27a2498d1f05db7a632f92de7e1d531823c Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 19 Jun 2024 16:11:15 +0900 Subject: [PATCH 01/26] github: backport docker build See PR#1496 Try to build and push for hub.docker.com In the previous versions, we use "Docker Build Cloud". It is useful by kicking via Web UI to trigger pre-defined build pipeline. Instead, there are limitation of pre-defined build pipelines. The max number of build pipelines is limited to 25. Thus, we can not maintain some target or architecture such as syslog, s3/arm64 and so on. And more, it means that we can't maintain v1.16 stable branch and v1.17 at the same time. Therefore we need to use alternative way - GitHub Actions. To setup actions, set Repository secrets: DOCKER_HUB_ORGS: fluent DOCKER_HUB_USERNAME: someone's account DOCKER_HUB_ACCESS_TOKEN: someone's access token With using GitHub Actions, the following image can be published again: * debian-elasticsearch7 arm64 * debian-logentries arm64 * debian-loggly arm64 * debian-logzio arm64 * debian-s3 arm64 * debian-papertrail * debian-papartrail arm64 Signed-off-by: Kentaro Hayashi --- .github/workflows/docker-build.yml | 205 +++++++++++++++++++++++++++++ Makefile | 3 + 2 files changed, 208 insertions(+) create mode 100644 .github/workflows/docker-build.yml diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml new file mode 100644 index 000000000..8d9cc9cfa --- /dev/null +++ b/.github/workflows/docker-build.yml @@ -0,0 +1,205 @@ +name: Publish Docker Image + +on: + push: + branches: + - v1.16 + tags: + - v1.* + +env: + REPOSITORY: ${{ secrets.DOCKER_HUB_ORGS }}/fluentd-kubernetes-daemonset +jobs: + define-matrix: + runs-on: ubuntu-latest + outputs: + components: ${{ steps.set-components.outputs.components }} + steps: + - id: set-components + run: | + components=$(echo '[ + "debian-azureblob", + "debian-cloudwatch", + "debian-elasticsearch7", + "debian-elasticsearch8", + "debian-forward", + "debian-gcs", + "debian-graylog", + "debian-kafka", + "debian-kafka2", + "debian-kinesis", + "debian-logentries", + "debian-loggly", + "debian-logzio", + "debian-opensearch", + "debian-papertrail", + "debian-s3", + "debian-syslog" + ]' | jq -c) + echo "components=$components" >> "$GITHUB_OUTPUT" + amd64: + needs: define-matrix + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + component: ${{ fromJSON(needs.define-matrix.outputs.components) }} + steps: + - uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + with: + platforms: linux/amd64 + - uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + - name: Setup tags + run: | + set -x + component=${{ matrix.component }} + echo "CONTEXT=docker-image/v1.16/${component}" >> ${GITHUB_ENV} + for target in $(make echo-all-images); do + case $target in + *$component-amd64*) + tags=$(echo $target | cut -d':' -f2-) + tag1=$(echo $tags | cut -d',' -f1) + tag2=$(echo $tags | cut -d',' -f2) + echo "AMD64TAGS=${{ env.REPOSITORY }}:${tag1},${{ env.REPOSITORY }}:${tag2}" >> ${GITHUB_ENV} + ;; + esac + done + - name: Build and push for amd64 + uses: docker/build-push-action@v6 + with: + context: ${{ env.CONTEXT }} + provenance: false + push: true + platforms: linux/amd64 + tags: ${{ env.AMD64TAGS }} + # dare to use old mediatype (application/vnd.docker.distribution.manifest.v2+json) + outputs: oci-mediatypes=false + arm64: + needs: define-matrix + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + component: ${{ fromJSON(needs.define-matrix.outputs.components) }} + steps: + - uses: actions/checkout@v4 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + with: + platforms: linux/arm64 + - uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + - name: Setup tags + run: | + set -x + component=${{ matrix.component }} + echo "CONTEXT=docker-image/v1.16/arm64/${component}" >> ${GITHUB_ENV} + for target in $(make echo-all-images); do + case $target in + *$component-arm64*) + tags=$(echo $target | cut -d':' -f2-) + tag1=$(echo $tags | cut -d',' -f1) + tag2=$(echo $tags | cut -d',' -f2) + echo "ARM64TAGS=${{ env.REPOSITORY }}:${tag1},${{ env.REPOSITORY }}:${tag2}" >> ${GITHUB_ENV} + ;; + esac + done + - name: Build and push for arm64 + uses: docker/build-push-action@v6 + with: + context: ${{ env.CONTEXT }} + provenance: false + push: true + platforms: linux/arm64 + cache-from: type=gha + cache-to: type=gha,mode=max + tags: ${{ env.ARM64TAGS }} + # dare to use old mediatype (application/vnd.docker.distribution.manifest.v2+json) + outputs: oci-mediatypes=false + manifest: + needs: [define-matrix, amd64, arm64] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + component: ${{ fromJSON(needs.define-matrix.outputs.components) }} + steps: + - uses: actions/checkout@v4 + - uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + - name: Create manifest + run: | + component=${{ matrix.component }} + for target in $(make echo-all-images); do + case $target in + *$component-amd64*) + tags=$(echo $target | cut -d':' -f2-) + tag1=$(echo $tags | cut -d',' -f1) + tag2=$(echo $tags | cut -d',' -f2) + MULTIARCH_AMD64_TAG=${tag1/amd64-/} + MULTIARCH_AMD64_SHORT_TAG=${tag2/amd64-/} + AMD64TAG=${tag1} + SHORT_AMD64TAG=${tag2} + ;; + *$component-arm64*) + tags=$(echo $target | cut -d':' -f2-) + tag1=$(echo $tags | cut -d',' -f1) + tag2=$(echo $tags | cut -d',' -f2) + MULTIARCH_ARM64_TAG=${tag1/arm64-/} + MULTIARCH_ARM64_SHORT_TAG=${tag2/arm64-/} + ARM64TAG=${tag1} + SHORT_ARM64TAG=${tag2} + ;; + esac + done + # v1.xx.x-debian-(component)-xxx + if [ ${MULTIARCH_AMD64_TAG} != ${MULTIARCH_ARM64_TAG} ]; then + echo "Multiarch tag (v1.xx.x-debian-(component)-xxx) must be same for amd64 and arm64: ${MULTIARCH_AMD64_TAG} != ${MULTIARCH_ARM64_TAG}" + else + docker buildx imagetools create -t ${{ env.REPOSITORY }}:${MULTIARCH_AMD64_TAG} \ + ${{ env.REPOSITORY }}:${AMD64TAG} \ + ${{ env.REPOSITORY }}:${ARM64TAG} + fi + # v1.xx-debian-(component)-xxx + if [ ${MULTIARCH_AMD64_SHORT_TAG} != ${MULTIARCH_ARM64_SHORT_TAG} ]; then + echo "Multiarch tag (v1.xx-debian-(component)-xxx) must be same for amd64 and arm64: ${MULTIARCH_AMD64_SHORT_TAG} != ${MULTIARCH_ARM64_SHORT_TAG}" + else + docker buildx imagetools create -t ${{ env.REPOSITORY }}:${MULTIARCH_AMD64_SHORT_TAG} \ + ${{ env.REPOSITORY }}:${SHORT_AMD64TAG} \ + ${{ env.REPOSITORY }}:${SHORT_ARM64TAG} + fi + echo "MULTIARCH_AMD64_TAG=${MULTIARCH_AMD64_TAG}" >> ${GITHUB_ENV} + echo "MULTIARCH_AMD64_SHORT_TAG=${MULTIARCH_AMD64_SHORT_TAG}" >> ${GITHUB_ENV} + echo "AMD64TAG=${AMD64TAG}" >> ${GITHUB_ENV} + echo "SHORT_AMD64TAG=${SHORT_ARM64TAG}" >> ${GITHUB_ENV} + echo "MULTIARCH_ARM64_TAG=${MULTIARCH_ARM64_TAG}" >> ${GITHUB_ENV} + echo "MULTIARCH_ARM64_SHORT_TAG=${MULTIARCH_ARM64_SHORT_TAG}" >> ${GITHUB_ENV} + echo "ARM64TAG=${ARM64TAG}" >> ${GITHUB_ENV} + echo "SHORT_ARM64TAG=${SHORT_ARM64TAG}" >> ${GITHUB_ENV} + - name: Inspect manifest ${{ env.AMD64TAG }} + run: docker manifest inspect ${{ env.REPOSITORY }}:${{ env.AMD64TAG }} + - name: Inspect manifest ${{ env.ARM64TAG }} + run: docker manifest inspect ${{ env.REPOSITORY }}:${{ env.ARM64TAG }} + - name: Inspect manifest ${{ env.MULTIARCH_AMD64_TAG }} + run: docker manifest inspect ${{ env.REPOSITORY }}:${{ env.MULTIARCH_AMD64_TAG }} + - name: Inspect manifest ${{ env.MULTIARCH_AMD64_SHORT_TAG }} + run: docker manifest inspect ${{ env.REPOSITORY }}:${{ env.MULTIARCH_AMD64_SHORT_TAG }} + - name: Inspect ${{ env.AMD64TAG }} with buildx + run: docker buildx imagetools inspect ${{ env.REPOSITORY }}:${{ env.AMD64TAG }} + - name: Inspect ${{ env.ARM64TAG }} with buildx + run: docker buildx imagetools inspect ${{ env.REPOSITORY }}:${{ env.ARM64TAG }} + - name: Inspect ${{ env.MULTIARCH_AMD64_TAG }} with buildx + run: docker buildx imagetools inspect ${{ env.REPOSITORY }}:${{ env.MULTIARCH_AMD64_TAG }} + - name: Inspect ${{ env.MULTIARCH_AMD64_SHORT_TAG }} with buildx + run: docker buildx imagetools inspect ${{ env.REPOSITORY }}:${{ env.MULTIARCH_AMD64_SHORT_TAG }} diff --git a/Makefile b/Makefile index 20171ea2a..11472a281 100644 --- a/Makefile +++ b/Makefile @@ -83,6 +83,9 @@ eq = $(if $(or $(1),$(2)),$(and $(findstring $(1),$(2)),\ no-cache-arg = $(if $(call eq, $(no-cache), yes), --no-cache, $(empty)) +echo-all-images: + @echo $(ALL_IMAGES) + # Build Docker image. # # Usage: From 54fe9c57a35b29e76670d5d17aecaa04c38ed20f Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Tue, 25 Jun 2024 16:40:39 +0900 Subject: [PATCH 02/26] github: use only tags Backport PR#1499 Both of branches and tags are specified, either branches or tags are pushed, GitHub Actions are triggered. In practical use-case, after some PRs has merged, we want to release it. Thus it is enough to specify tags. Signed-off-by: Kentaro Hayashi --- .github/workflows/docker-build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 8d9cc9cfa..c1b890d56 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -2,8 +2,6 @@ name: Publish Docker Image on: push: - branches: - - v1.16 tags: - v1.* From c03244ff515e76b955fe0d261b30a32d59092fd5 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 10 Jul 2024 14:16:45 +0900 Subject: [PATCH 03/26] Do not remove runtime packages Closes: #1492 related: https://github.com/fluent/fluentd-docker-image/pull/383 Reported by @gpapaz When runtime package was not specified explicitly, apt-get purge --auto-remove removes runtime packages. So not to be removed libsasl2-2 by apt-get purge --auto-remove '*-dev', install them explicitly in beforehand. Signed-off-by: Kentaro Hayashi --- templates/Dockerfile.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/Dockerfile.erb b/templates/Dockerfile.erb index 0ebd0bd36..dba01f613 100644 --- a/templates/Dockerfile.erb +++ b/templates/Dockerfile.erb @@ -29,8 +29,8 @@ 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<% elsif target == "s3" %> curl<% end %><% if requires_git %> git<% end %>" \ - runtimeDeps="<% if target == "kafka" || target == "kafka2" %>krb5-kdc libsasl2-modules-gssapi-mit libsasl2-dev<% elsif target == "azureblob" %>pkg-config libxslt-dev libxml2-dev<% 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<% 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 \ && apt-get install \ From 93fbb451423554ff1b0c88dc639a7b7bf3167303 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 10 Jul 2024 14:38:29 +0900 Subject: [PATCH 04/26] Bump version to v1.16.5-1.1 Signed-off-by: Kentaro Hayashi --- Makefile | 68 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 11472a281..3bdc2e25f 100644 --- a/Makefile +++ b/Makefile @@ -12,44 +12,44 @@ IMAGE_NAME := fluent/fluentd-kubernetes X86_IMAGES := \ - v1.16/debian-azureblob:v1.16.5-debian-azureblob-amd64-1.0,v1.16-debian-azureblob-amd64-2 \ - v1.16/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-amd64-1.0,v1.16-debian-elasticsearch8-amd64-2 \ - v1.16/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-amd64-1.0,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ - v1.16/debian-opensearch:v1.16.5-debian-opensearch-amd64-1.0,v1.16-debian-opensearch-amd64-2 \ - v1.16/debian-loggly:v1.16.5-debian-loggly-amd64-1.0,v1.16-debian-loggly-amd64-2 \ - v1.16/debian-logentries:v1.16.5-debian-logentries-amd64-1.0,v1.16-debian-logentries-amd64-2 \ - v1.16/debian-cloudwatch:v1.16.5-debian-cloudwatch-amd64-1.0,v1.16-debian-cloudwatch-amd64-2 \ - v1.16/debian-s3:v1.16.5-debian-s3-amd64-1.0,v1.16-debian-s3-amd64-2 \ - v1.16/debian-syslog:v1.16.5-debian-syslog-amd64-1.0,v1.16-debian-syslog-amd64-2 \ - v1.16/debian-forward:v1.16.5-debian-forward-amd64-1.0,v1.16-debian-forward-amd64-2 \ - v1.16/debian-gcs:v1.16.5-debian-gcs-amd64-1.0,v1.16-debian-gcs-amd64-2 \ - v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.0,v1.16-debian-graylog-amd64-2 \ - v1.16/debian-papertrail:v1.16.5-debian-papertrail-amd64-1.0,v1.16-debian-papertrail-amd64-2 \ - v1.16/debian-logzio:v1.16.5-debian-logzio-amd64-1.0,v1.16-debian-logzio-amd64-2 \ - v1.16/debian-kafka:v1.16.5-debian-kafka-amd64-1.0,v1.16-debian-kafka-amd64-2 \ - v1.16/debian-kafka2:v1.16.5-debian-kafka2-amd64-1.0,v1.16-debian-kafka2-amd64-2 \ - v1.16/debian-kinesis:v1.16.5-debian-kinesis-amd64-1.0,v1.16-debian-kinesis-amd64-2 + v1.16/debian-azureblob:v1.16.5-debian-azureblob-amd64-1.1,v1.16-debian-azureblob-amd64-2 \ + v1.16/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-amd64-1.1,v1.16-debian-elasticsearch8-amd64-2 \ + v1.16/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-amd64-1.1,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ + v1.16/debian-opensearch:v1.16.5-debian-opensearch-amd64-1.1,v1.16-debian-opensearch-amd64-2 \ + v1.16/debian-loggly:v1.16.5-debian-loggly-amd64-1.1,v1.16-debian-loggly-amd64-2 \ + v1.16/debian-logentries:v1.16.5-debian-logentries-amd64-1.1,v1.16-debian-logentries-amd64-2 \ + v1.16/debian-cloudwatch:v1.16.5-debian-cloudwatch-amd64-1.1,v1.16-debian-cloudwatch-amd64-2 \ + v1.16/debian-s3:v1.16.5-debian-s3-amd64-1.1,v1.16-debian-s3-amd64-2 \ + v1.16/debian-syslog:v1.16.5-debian-syslog-amd64-1.1,v1.16-debian-syslog-amd64-2 \ + v1.16/debian-forward:v1.16.5-debian-forward-amd64-1.1,v1.16-debian-forward-amd64-2 \ + v1.16/debian-gcs:v1.16.5-debian-gcs-amd64-1.1,v1.16-debian-gcs-amd64-2 \ + v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.1,v1.16-debian-graylog-amd64-2 \ + v1.16/debian-papertrail:v1.16.5-debian-papertrail-amd64-1.1,v1.16-debian-papertrail-amd64-2 \ + v1.16/debian-logzio:v1.16.5-debian-logzio-amd64-1.1,v1.16-debian-logzio-amd64-2 \ + v1.16/debian-kafka:v1.16.5-debian-kafka-amd64-1.1,v1.16-debian-kafka-amd64-2 \ + v1.16/debian-kafka2:v1.16.5-debian-kafka2-amd64-1.1,v1.16-debian-kafka2-amd64-2 \ + v1.16/debian-kinesis:v1.16.5-debian-kinesis-amd64-1.1,v1.16-debian-kinesis-amd64-2 # :,,,... ARM64_IMAGES := \ - v1.16/arm64/debian-azureblob:v1.16.5-debian-azureblob-arm64-1.0,v1.16-debian-azureblob-arm64-2 \ - v1.16/arm64/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-arm64-1.0,v1.16-debian-elasticsearch8-arm64-2 \ - v1.16/arm64/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-arm64-1.0,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ - v1.16/arm64/debian-opensearch:v1.16.5-debian-opensearch-arm64-1.0,v1.16-debian-opensearch-arm64-2 \ - v1.16/arm64/debian-loggly:v1.16.5-debian-loggly-arm64-1.0,v1.16-debian-loggly-arm64-2 \ - v1.16/arm64/debian-logentries:v1.16.5-debian-logentries-arm64-1.0,v1.16-debian-logentries-arm64-2 \ - v1.16/arm64/debian-cloudwatch:v1.16.5-debian-cloudwatch-arm64-1.0,v1.16-debian-cloudwatch-arm64-2 \ - v1.16/arm64/debian-s3:v1.16.5-debian-s3-arm64-1.0,v1.16-debian-s3-arm64-2 \ - v1.16/arm64/debian-syslog:v1.16.5-debian-syslog-arm64-1.0,v1.16-debian-syslog-arm64-2 \ - v1.16/arm64/debian-forward:v1.16.5-debian-forward-arm64-1.0,v1.16-debian-forward-arm64-2 \ - v1.16/arm64/debian-gcs:v1.16.5-debian-gcs-arm64-1.0,v1.16-debian-gcs-arm64-2 \ - v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.0,v1.16-debian-graylog-arm64-2 \ - v1.16/arm64/debian-papertrail:v1.16.5-debian-papertrail-arm64-1.0,v1.16-debian-papertrail-arm64-2 \ - v1.16/arm64/debian-logzio:v1.16.5-debian-logzio-arm64-1.0,v1.16-debian-logzio-arm64-2 \ - v1.16/arm64/debian-kafka:v1.16.5-debian-kafka-arm64-1.0,v1.16-debian-kafka-arm64-2 \ - v1.16/arm64/debian-kafka2:v1.16.5-debian-kafka2-arm64-1.0,v1.16-debian-kafka2-arm64-2 \ - v1.16/arm64/debian-kinesis:v1.16.5-debian-kinesis-arm64-1.0,v1.16-debian-kinesis-arm64-2 + v1.16/arm64/debian-azureblob:v1.16.5-debian-azureblob-arm64-1.1,v1.16-debian-azureblob-arm64-2 \ + v1.16/arm64/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-arm64-1.1,v1.16-debian-elasticsearch8-arm64-2 \ + v1.16/arm64/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-arm64-1.1,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ + v1.16/arm64/debian-opensearch:v1.16.5-debian-opensearch-arm64-1.1,v1.16-debian-opensearch-arm64-2 \ + v1.16/arm64/debian-loggly:v1.16.5-debian-loggly-arm64-1.1,v1.16-debian-loggly-arm64-2 \ + v1.16/arm64/debian-logentries:v1.16.5-debian-logentries-arm64-1.1,v1.16-debian-logentries-arm64-2 \ + v1.16/arm64/debian-cloudwatch:v1.16.5-debian-cloudwatch-arm64-1.1,v1.16-debian-cloudwatch-arm64-2 \ + v1.16/arm64/debian-s3:v1.16.5-debian-s3-arm64-1.1,v1.16-debian-s3-arm64-2 \ + v1.16/arm64/debian-syslog:v1.16.5-debian-syslog-arm64-1.1,v1.16-debian-syslog-arm64-2 \ + v1.16/arm64/debian-forward:v1.16.5-debian-forward-arm64-1.1,v1.16-debian-forward-arm64-2 \ + v1.16/arm64/debian-gcs:v1.16.5-debian-gcs-arm64-1.1,v1.16-debian-gcs-arm64-2 \ + v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.1,v1.16-debian-graylog-arm64-2 \ + v1.16/arm64/debian-papertrail:v1.16.5-debian-papertrail-arm64-1.1,v1.16-debian-papertrail-arm64-2 \ + v1.16/arm64/debian-logzio:v1.16.5-debian-logzio-arm64-1.1,v1.16-debian-logzio-arm64-2 \ + v1.16/arm64/debian-kafka:v1.16.5-debian-kafka-arm64-1.1,v1.16-debian-kafka-arm64-2 \ + v1.16/arm64/debian-kafka2:v1.16.5-debian-kafka2-arm64-1.1,v1.16-debian-kafka2-arm64-2 \ + v1.16/arm64/debian-kinesis:v1.16.5-debian-kinesis-arm64-1.1,v1.16-debian-kinesis-arm64-2 ALL_IMAGES := $(X86_IMAGES) $(ARM64_IMAGES) From daab415d79cddd8b73194f2751131ad9f1780084 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 10 Jul 2024 17:50:00 +0900 Subject: [PATCH 05/26] Add v1.16.5-1.1 images Signed-off-by: Kentaro Hayashi --- README.md | 74 +++++++++---------- .../v1.16/arm64/debian-azureblob/Gemfile.lock | 37 +++++----- .../arm64/debian-azureblob/hooks/post_push | 2 +- .../arm64/debian-cloudwatch/Gemfile.lock | 39 +++++----- .../arm64/debian-cloudwatch/hooks/post_push | 2 +- .../arm64/debian-elasticsearch7/Gemfile.lock | 46 ++++++------ .../debian-elasticsearch7/hooks/post_push | 2 +- .../arm64/debian-elasticsearch8/Gemfile.lock | 41 +++++----- .../debian-elasticsearch8/hooks/post_push | 2 +- .../v1.16/arm64/debian-forward/Gemfile.lock | 29 ++++---- .../arm64/debian-forward/hooks/post_push | 2 +- .../v1.16/arm64/debian-gcs/Gemfile.lock | 49 ++++++------ .../v1.16/arm64/debian-gcs/hooks/post_push | 2 +- .../v1.16/arm64/debian-graylog/Gemfile.lock | 31 ++++---- .../arm64/debian-graylog/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka/Dockerfile | 4 +- .../v1.16/arm64/debian-kafka/Gemfile.lock | 31 ++++---- .../v1.16/arm64/debian-kafka/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka2/Dockerfile | 4 +- .../v1.16/arm64/debian-kafka2/Gemfile.lock | 31 ++++---- .../v1.16/arm64/debian-kafka2/hooks/post_push | 2 +- .../v1.16/arm64/debian-kinesis/Gemfile.lock | 45 +++++------ .../arm64/debian-kinesis/hooks/post_push | 2 +- .../arm64/debian-logentries/Gemfile.lock | 29 ++++---- .../arm64/debian-logentries/hooks/post_push | 2 +- .../v1.16/arm64/debian-loggly/Gemfile.lock | 29 ++++---- .../v1.16/arm64/debian-loggly/hooks/post_push | 2 +- .../v1.16/arm64/debian-logzio/Gemfile.lock | 29 ++++---- .../v1.16/arm64/debian-logzio/hooks/post_push | 2 +- .../arm64/debian-opensearch/Gemfile.lock | 41 +++++----- .../arm64/debian-opensearch/hooks/post_push | 2 +- .../arm64/debian-papertrail/Gemfile.lock | 29 ++++---- .../arm64/debian-papertrail/hooks/post_push | 2 +- .../v1.16/arm64/debian-s3/Gemfile.lock | 51 +++++++------ .../v1.16/arm64/debian-s3/hooks/post_push | 2 +- .../v1.16/arm64/debian-syslog/Gemfile.lock | 29 ++++---- .../v1.16/arm64/debian-syslog/hooks/post_push | 2 +- .../v1.16/debian-azureblob/Gemfile.lock | 37 +++++----- .../v1.16/debian-azureblob/hooks/post_push | 2 +- .../v1.16/debian-cloudwatch/Gemfile.lock | 39 +++++----- .../v1.16/debian-cloudwatch/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch7/Gemfile.lock | 46 ++++++------ .../debian-elasticsearch7/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch8/Gemfile.lock | 41 +++++----- .../debian-elasticsearch8/hooks/post_push | 2 +- .../v1.16/debian-forward/Gemfile.lock | 29 ++++---- .../v1.16/debian-forward/hooks/post_push | 2 +- docker-image/v1.16/debian-gcs/Gemfile.lock | 49 ++++++------ docker-image/v1.16/debian-gcs/hooks/post_push | 2 +- .../v1.16/debian-graylog/Gemfile.lock | 31 ++++---- .../v1.16/debian-graylog/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka/Dockerfile | 4 +- docker-image/v1.16/debian-kafka/Gemfile.lock | 31 ++++---- .../v1.16/debian-kafka/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka2/Dockerfile | 4 +- docker-image/v1.16/debian-kafka2/Gemfile.lock | 31 ++++---- .../v1.16/debian-kafka2/hooks/post_push | 2 +- .../v1.16/debian-kinesis/Gemfile.lock | 45 +++++------ .../v1.16/debian-kinesis/hooks/post_push | 2 +- .../v1.16/debian-logentries/Gemfile.lock | 29 ++++---- .../v1.16/debian-logentries/hooks/post_push | 2 +- docker-image/v1.16/debian-loggly/Gemfile.lock | 29 ++++---- .../v1.16/debian-loggly/hooks/post_push | 2 +- docker-image/v1.16/debian-logzio/Gemfile.lock | 29 ++++---- .../v1.16/debian-logzio/hooks/post_push | 2 +- .../v1.16/debian-opensearch/Gemfile.lock | 41 +++++----- .../v1.16/debian-opensearch/hooks/post_push | 2 +- .../v1.16/debian-papertrail/Gemfile.lock | 29 ++++---- .../v1.16/debian-papertrail/hooks/post_push | 2 +- docker-image/v1.16/debian-s3/Gemfile.lock | 51 +++++++------ docker-image/v1.16/debian-s3/hooks/post_push | 2 +- docker-image/v1.16/debian-syslog/Gemfile.lock | 29 ++++---- .../v1.16/debian-syslog/hooks/post_push | 2 +- 73 files changed, 753 insertions(+), 637 deletions(-) diff --git a/README.md b/README.md index 8d84b5056..77a962a5d 100644 --- a/README.md +++ b/README.md @@ -25,130 +25,130 @@ If you want to use above non published images, build it by yourself. Dockerfile ##### Multi-Arch images - `Azureblob` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-2` - `Elasticsearch8` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-2` - `Elasticsearch7` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch` - `Opensearch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-2` - `Cloudwatch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-2` - `Forward` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-2` - `Gcs` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-2` - `Graylog` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-2` - `Kafka` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-2` - `Kafka2` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-2` - `Kinesis` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-2` ##### x86_64 images - `Azureblob` [Dockerfile](docker-image/v1.16/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-amd64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-amd64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-amd64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-amd64` - `Opensearch` [Dockerfile](docker-image/v1.16/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-amd64-2` - `Loggly` [Dockerfile](docker-image/v1.16/debian-loggly/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-loggly-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-loggly-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-loggly-amd64-2` - `Logentries` [Dockerfile](docker-image/v1.16/debian-logentries/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logentries-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logentries-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-logentries-amd64-2` - `Cloudwatch` [Dockerfile](docker-image/v1.16/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-amd64-2` - `S3` [Dockerfile](docker-image/v1.16/debian-s3/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-s3-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-s3-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-s3-amd64-2` - `Syslog` [Dockerfile](docker-image/v1.16/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-amd64-2` - `Gcs` [Dockerfile](docker-image/v1.16/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-amd64-2` - `Graylog` [Dockerfile](docker-image/v1.16/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-amd64-2` - `Papertrail` [Dockerfile](docker-image/v1.16/debian-papertrail/Dockerfile) - `Logzio` [Dockerfile](docker-image/v1.16/debian-logzio/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logzio-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logzio-amd64-1.1` - `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.5-debian-kafka-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-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.5-debian-kafka2-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-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.5-debian-kinesis-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-amd64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-amd64-2` ##### arm64 images - `Azureblob` [Dockerfile](docker-image/v1.16/arm64/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-arm64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-arm64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-arm64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-arm64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-arm64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-arm64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-arm64` - `Opensearch` [Dockerfile](docker-image/v1.16/arm64/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-arm64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-arm64-2` - `Loggly` [Dockerfile](docker-image/v1.16/arm64/debian-loggly/Dockerfile) - `Logentries` [Dockerfile](docker-image/v1.16/arm64/debian-logentries/Dockerfile) - `Cloudwatch` [Dockerfile](docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-arm64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-arm64-2` - `S3` [Dockerfile](docker-image/v1.16/arm64/debian-s3/Dockerfile) - `Syslog` [Dockerfile](docker-image/v1.16/arm64/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/arm64/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-arm64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-arm64-2` - `Gcs` [Dockerfile](docker-image/v1.16/arm64/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-arm64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-arm64-2` - `Graylog` [Dockerfile](docker-image/v1.16/arm64/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-arm64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-arm64-2` - `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.5-debian-kafka-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-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.5-debian-kafka2-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-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.5-debian-kinesis-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-arm64-1.1` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-arm64-2` diff --git a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock index 125269ae9..9b66c4568 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) azure-storage-blob (2.0.3) azure-storage-common (~> 2.0) nokogiri (~> 1, >= 1.10.8) @@ -12,9 +12,9 @@ GEM net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) base64 (0.2.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) - cool.io (1.8.0) + cool.io (1.8.1) domain_name (0.6.20240107) faraday (1.10.3) faraday-em_http (~> 1.0) @@ -41,7 +41,7 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -97,13 +97,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -114,34 +114,37 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) - mini_portile2 (2.8.5) + mime-types-data (3.2024.0702) + mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) - multipart-post (2.4.0) + multipart-post (2.4.1) net-http-persistent (4.0.2) connection_pool (~> 2.2) netrc (0.11.0) - nokogiri (1.16.3) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - racc (1.7.3) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + racc (1.8.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan ruby2_keywords (0.0.5) serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push b/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push index 9ab52e4f7..53b935f45 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-azureblob/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.5-debian-azureblob-arm64-1.0,v1.16-debian-azureblob-arm64-2}; do +for tag in {v1.16.5-debian-azureblob-arm64-1.1,v1.16-debian-azureblob-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-cloudwatch/Gemfile.lock b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock index 5ceb71d7b..bd5231424 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.903.0) - aws-sdk-cloudwatchlogs (1.80.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-core (3.191.5) + aws-partitions (1.954.0) + aws-sdk-cloudwatchlogs (1.87.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -16,10 +16,10 @@ GEM aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -75,14 +75,14 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -93,25 +93,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push index 6fc49e01e..54504c40d 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-cloudwatch/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.5-debian-cloudwatch-arm64-1.0,v1.16-debian-cloudwatch-arm64-2}; do +for tag in {v1.16.5-debian-cloudwatch-arm64-1.1,v1.16-debian-cloudwatch-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-elasticsearch7/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock index 4453cbb45..45c1cc4eb 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock @@ -1,23 +1,24 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - elasticsearch (7.17.10) - elasticsearch-api (= 7.17.10) - elasticsearch-transport (= 7.17.10) - elasticsearch-api (7.17.10) + elasticsearch (7.17.11) + elasticsearch-api (= 7.17.11) + elasticsearch-transport (= 7.17.11) + elasticsearch-api (7.17.11) multi_json - elasticsearch-transport (7.17.10) + elasticsearch-transport (7.17.11) + base64 faraday (>= 1, < 3) multi_json - elasticsearch-xpack (7.17.10) + elasticsearch-xpack (7.17.11) elasticsearch-api (>= 6) - excon (0.110.0) + excon (0.111.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -41,7 +42,7 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -101,13 +102,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -118,27 +119,30 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) - multipart-post (2.4.0) + multipart-post (2.4.1) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan ruby2_keywords (0.0.5) serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push index eb71f8474..04205057f 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/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.5-debian-elasticsearch7-arm64-1.0,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; do +for tag in {v1.16.5-debian-elasticsearch7-arm64-1.1,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; 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-elasticsearch8/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock index b64eb2358..a955551f9 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock @@ -1,29 +1,30 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) elastic-transport (8.3.2) faraday (< 3) multi_json - elasticsearch (8.12.2) + elasticsearch (8.14.0) elastic-transport (~> 8.3) - elasticsearch-api (= 8.12.2) - elasticsearch-api (8.12.2) + elasticsearch-api (= 8.14.0) + elasticsearch-api (8.14.0) multi_json - excon (0.110.0) - faraday (2.9.0) + excon (0.111.0) + faraday (2.10.0) faraday-net_http (>= 2.0, < 3.2) + logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) faraday-net_http (3.1.0) net-http - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -84,13 +85,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -98,30 +99,34 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.0) lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) uri netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push index a238f2d2d..104956c80 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/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.5-debian-elasticsearch8-arm64-1.0,v1.16-debian-elasticsearch8-arm64-2}; do +for tag in {v1.16.5-debian-elasticsearch8-arm64-1.1,v1.16-debian-elasticsearch8-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-forward/Gemfile.lock b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock index 20bb95fe4..3a057961b 100644 --- a/docker-image/v1.16/arm64/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -60,13 +60,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -77,25 +77,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-forward/hooks/post_push b/docker-image/v1.16/arm64/debian-forward/hooks/post_push index 3e0be7c28..c39fe371e 100644 --- a/docker-image/v1.16/arm64/debian-forward/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-forward/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.5-debian-forward-arm64-1.0,v1.16-debian-forward-arm64-2}; do +for tag in {v1.16.5-debian-forward-arm64-1.1,v1.16-debian-forward-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-gcs/Gemfile.lock b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock index b490bc7d2..0a4aca427 100644 --- a/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock @@ -1,20 +1,21 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - faraday (2.9.0) + faraday (2.10.0) faraday-net_http (>= 2.0, < 3.2) + logger faraday-net_http (3.1.0) net-http - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -63,7 +64,7 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-apis-core (0.14.1) + google-apis-core (0.15.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 1.9) httpclient (>= 2.8.1, < 3.a) @@ -71,22 +72,22 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml - google-apis-iamcredentials_v1 (0.20.0) - google-apis-core (>= 0.14.0, < 2.a) - google-apis-storage_v1 (0.37.0) - google-apis-core (>= 0.14.0, < 2.a) + google-apis-iamcredentials_v1 (0.21.0) + google-apis-core (>= 0.15.0, < 2.a) + google-apis-storage_v1 (0.40.0) + google-apis-core (>= 0.15.0, < 2.a) google-cloud-core (1.7.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (2.1.1) faraday (>= 1.0, < 3.a) google-cloud-errors (1.4.0) - google-cloud-storage (1.49.0) + google-cloud-storage (1.52.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-core (~> 0.13) google-apis-iamcredentials_v1 (~> 0.18) - google-apis-storage_v1 (~> 0.33) + google-apis-storage_v1 (~> 0.38) google-cloud-core (~> 1.6) googleauth (~> 1.9) mini_mime (~> 1.0) @@ -104,16 +105,16 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) httpclient (2.8.3) jsonpath (1.1.5) multi_json - jwt (2.8.1) + jwt (2.8.2) base64 - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -121,10 +122,11 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.0) lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) mini_mime (1.1.5) msgpack (1.7.2) multi_json (1.15.0) @@ -133,10 +135,11 @@ GEM netrc (0.11.0) oj (3.15.1) os (1.1.4) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -147,7 +150,8 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retriable (3.1.2) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) @@ -157,6 +161,7 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) trailblazer-option (0.1.2) diff --git a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push b/docker-image/v1.16/arm64/debian-gcs/hooks/post_push index 93feef778..3cec3633f 100644 --- a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-gcs/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.5-debian-gcs-arm64-1.0,v1.16-debian-gcs-arm64-2}; do +for tag in {v1.16.5-debian-gcs-arm64-1.1,v1.16-debian-gcs-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-graylog/Gemfile.lock b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock index d9216c5c7..b89c8195f 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -65,14 +65,14 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.1) + json (2.7.2) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -83,25 +83,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push b/docker-image/v1.16/arm64/debian-graylog/hooks/post_push index 2851f90f1..587aa239a 100644 --- a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-graylog/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.5-debian-graylog-arm64-1.0,v1.16-debian-graylog-arm64-2}; do +for tag in {v1.16.5-debian-graylog-arm64-1.1,v1.16-debian-graylog-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-kafka/Dockerfile b/docker-image/v1.16/arm64/debian-kafka/Dockerfile index 90ba062ca..2b2857e70 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Dockerfile +++ b/docker-image/v1.16/arm64/debian-kafka/Dockerfile @@ -21,8 +21,8 @@ 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" \ - runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-dev" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev" \ + runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2" \ && export DEBIAN_FRONTEND=noninteractive && apt-get update \ && apt-get upgrade -y \ && apt-get install \ diff --git a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock index 38c357751..f9c4fc4de 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock @@ -1,17 +1,17 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) avro (1.11.3) multi_json (~> 1.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -74,13 +74,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -92,26 +92,28 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) - mini_portile2 (2.8.5) + mime-types-data (3.2024.0702) + mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) rdkafka (0.11.1) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - recursive-open-struct (1.1.3) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan ruby-kafka (1.5.0) digest-crc serverengine (2.3.2) @@ -119,6 +121,7 @@ GEM sigdump (0.2.5) snappy (0.0.17) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) 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 c4003edbb..185b0ceda 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.5-debian-kafka-arm64-1.0,v1.16-debian-kafka-arm64-2}; do +for tag in {v1.16.5-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 90ba062ca..2b2857e70 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Dockerfile +++ b/docker-image/v1.16/arm64/debian-kafka2/Dockerfile @@ -21,8 +21,8 @@ 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" \ - runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-dev" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev" \ + runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2" \ && export DEBIAN_FRONTEND=noninteractive && apt-get update \ && apt-get upgrade -y \ && apt-get install \ diff --git a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock index 38c357751..f9c4fc4de 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock @@ -1,17 +1,17 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) avro (1.11.3) multi_json (~> 1.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -74,13 +74,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -92,26 +92,28 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) - mini_portile2 (2.8.5) + mime-types-data (3.2024.0702) + mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) rdkafka (0.11.1) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - recursive-open-struct (1.1.3) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan ruby-kafka (1.5.0) digest-crc serverengine (2.3.2) @@ -119,6 +121,7 @@ GEM sigdump (0.2.5) snappy (0.0.17) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) 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 50efc63a3..58f6a9424 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.5-debian-kafka2-arm64-1.0,v1.16-debian-kafka2-arm64-2}; do +for tag in {v1.16.5-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/arm64/debian-kinesis/Gemfile.lock b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock index 2c50bbd84..de001e417 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock @@ -1,28 +1,28 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.903.0) - aws-sdk-core (3.191.5) + aws-partitions (1.954.0) + aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.66.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.55.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) + aws-sdk-firehose (1.75.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-kinesis (1.62.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -81,14 +81,14 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -99,25 +99,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push b/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push index da73196a2..17f8b652d 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-kinesis/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.5-debian-kinesis-arm64-1.0,v1.16-debian-kinesis-arm64-2}; do +for tag in {v1.16.5-debian-kinesis-arm64-1.1,v1.16-debian-kinesis-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-logentries/Gemfile.lock b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock index 20bb95fe4..3a057961b 100644 --- a/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -60,13 +60,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -77,25 +77,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push b/docker-image/v1.16/arm64/debian-logentries/hooks/post_push index c1d60086f..5fb754e1e 100644 --- a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logentries/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.5-debian-logentries-arm64-1.0,v1.16-debian-logentries-arm64-2}; do +for tag in {v1.16.5-debian-logentries-arm64-1.1,v1.16-debian-logentries-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-loggly/Gemfile.lock b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock index 476c3c531..6f7c69caf 100644 --- a/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -63,13 +63,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -80,26 +80,29 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (2.9.4) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push b/docker-image/v1.16/arm64/debian-loggly/hooks/post_push index ba442cb65..abfe4a799 100644 --- a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-loggly/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.5-debian-loggly-arm64-1.0,v1.16-debian-loggly-arm64-2}; do +for tag in {v1.16.5-debian-loggly-arm64-1.1,v1.16-debian-loggly-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-logzio/Gemfile.lock b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock index 99731ced6..8cdb09d27 100644 --- a/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) - cool.io (1.8.0) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -65,13 +65,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -82,27 +82,30 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (4.0.2) connection_pool (~> 2.2) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push b/docker-image/v1.16/arm64/debian-logzio/hooks/post_push index 6eceba785..b5c86cddf 100644 --- a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logzio/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.5-debian-logzio-arm64-1.0,v1.16-debian-logzio-arm64-2}; do +for tag in {v1.16.5-debian-logzio-arm64-1.1,v1.16-debian-logzio-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-opensearch/Gemfile.lock b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock index 1d47ec335..6ae71d2ab 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.903.0) - aws-sdk-core (3.191.5) + aws-partitions (1.954.0) + aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -13,12 +13,13 @@ GEM aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - excon (0.110.0) - faraday (2.9.0) + excon (0.111.0) + faraday (2.10.0) faraday-net_http (>= 2.0, < 3.2) + logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) @@ -27,7 +28,7 @@ GEM faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) faraday (>= 2.0, < 3) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -88,14 +89,14 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -103,33 +104,37 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.0) lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) uri netrc (0.11.0) oj (3.15.1) - opensearch-ruby (3.1.0) + opensearch-ruby (3.3.0) faraday (>= 1.0, < 3) multi_json (>= 1.0) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push b/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push index 13c596fc1..1fa000d67 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-opensearch/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.5-debian-opensearch-arm64-1.0,v1.16-debian-opensearch-arm64-2}; do +for tag in {v1.16.5-debian-opensearch-arm64-1.1,v1.16-debian-opensearch-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-papertrail/Gemfile.lock b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock index 351e8017a..8c0a4d2f6 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -66,13 +66,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -83,25 +83,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push b/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push index 9d524cb5e..11cd13ecf 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-papertrail/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.5-debian-papertrail-arm64-1.0,v1.16-debian-papertrail-arm64-2}; do +for tag in {v1.16.5-debian-papertrail-arm64-1.1,v1.16-debian-papertrail-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-s3/Gemfile.lock b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock index c199ea4b1..3b8857551 100644 --- a/docker-image/v1.16/arm64/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock @@ -1,32 +1,32 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.903.0) - aws-sdk-core (3.191.5) + aws-partitions (1.954.0) + aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.78.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.146.1) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-kms (1.88.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.156.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.8) - aws-sdk-sqs (1.70.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) + aws-sigv4 (~> 1.5) + aws-sdk-sqs (1.80.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -83,14 +83,14 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -101,25 +101,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/arm64/debian-s3/hooks/post_push b/docker-image/v1.16/arm64/debian-s3/hooks/post_push index 52117c5d8..0308eaab0 100644 --- a/docker-image/v1.16/arm64/debian-s3/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-s3/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.5-debian-s3-arm64-1.0,v1.16-debian-s3-arm64-2}; do +for tag in {v1.16.5-debian-s3-arm64-1.1,v1.16-debian-s3-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-syslog/Gemfile.lock b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock index 8fcc1f664..de091e8f9 100644 --- a/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -63,13 +63,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -80,15 +80,16 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) remote_syslog_sender (1.2.2) syslog_protocol rest-client (2.1.0) @@ -96,11 +97,13 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) syslog_protocol (0.9.2) systemd-journal (1.4.2) ffi (~> 1.9) diff --git a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push b/docker-image/v1.16/arm64/debian-syslog/hooks/post_push index 89c20b65e..b3e72cf78 100644 --- a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-syslog/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.5-debian-syslog-arm64-1.0,v1.16-debian-syslog-arm64-2}; do +for tag in {v1.16.5-debian-syslog-arm64-1.1,v1.16-debian-syslog-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-azureblob/Gemfile.lock b/docker-image/v1.16/debian-azureblob/Gemfile.lock index 125269ae9..9b66c4568 100644 --- a/docker-image/v1.16/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/debian-azureblob/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) azure-storage-blob (2.0.3) azure-storage-common (~> 2.0) nokogiri (~> 1, >= 1.10.8) @@ -12,9 +12,9 @@ GEM net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) base64 (0.2.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) - cool.io (1.8.0) + cool.io (1.8.1) domain_name (0.6.20240107) faraday (1.10.3) faraday-em_http (~> 1.0) @@ -41,7 +41,7 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -97,13 +97,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -114,34 +114,37 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) - mini_portile2 (2.8.5) + mime-types-data (3.2024.0702) + mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) - multipart-post (2.4.0) + multipart-post (2.4.1) net-http-persistent (4.0.2) connection_pool (~> 2.2) netrc (0.11.0) - nokogiri (1.16.3) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - racc (1.7.3) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + racc (1.8.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan ruby2_keywords (0.0.5) serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-azureblob/hooks/post_push b/docker-image/v1.16/debian-azureblob/hooks/post_push index 8c1101d86..dd7cb6d61 100644 --- a/docker-image/v1.16/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/debian-azureblob/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.5-debian-azureblob-amd64-1.0,v1.16-debian-azureblob-amd64-2}; do +for tag in {v1.16.5-debian-azureblob-amd64-1.1,v1.16-debian-azureblob-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-cloudwatch/Gemfile.lock b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock index 5ceb71d7b..bd5231424 100644 --- a/docker-image/v1.16/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.903.0) - aws-sdk-cloudwatchlogs (1.80.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-core (3.191.5) + aws-partitions (1.954.0) + aws-sdk-cloudwatchlogs (1.87.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -16,10 +16,10 @@ GEM aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -75,14 +75,14 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -93,25 +93,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/debian-cloudwatch/hooks/post_push index baa9358e0..2a4b685e7 100644 --- a/docker-image/v1.16/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/debian-cloudwatch/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.5-debian-cloudwatch-amd64-1.0,v1.16-debian-cloudwatch-amd64-2}; do +for tag in {v1.16.5-debian-cloudwatch-amd64-1.1,v1.16-debian-cloudwatch-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-elasticsearch7/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock index 4453cbb45..45c1cc4eb 100644 --- a/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock @@ -1,23 +1,24 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - elasticsearch (7.17.10) - elasticsearch-api (= 7.17.10) - elasticsearch-transport (= 7.17.10) - elasticsearch-api (7.17.10) + elasticsearch (7.17.11) + elasticsearch-api (= 7.17.11) + elasticsearch-transport (= 7.17.11) + elasticsearch-api (7.17.11) multi_json - elasticsearch-transport (7.17.10) + elasticsearch-transport (7.17.11) + base64 faraday (>= 1, < 3) multi_json - elasticsearch-xpack (7.17.10) + elasticsearch-xpack (7.17.11) elasticsearch-api (>= 6) - excon (0.110.0) + excon (0.111.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -41,7 +42,7 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -101,13 +102,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -118,27 +119,30 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) - multipart-post (2.4.0) + multipart-post (2.4.1) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan ruby2_keywords (0.0.5) serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/debian-elasticsearch7/hooks/post_push index d7926a322..14f60baef 100644 --- a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch7/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.5-debian-elasticsearch7-amd64-1.0,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; do +for tag in {v1.16.5-debian-elasticsearch7-amd64-1.1,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; 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-elasticsearch8/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock index b64eb2358..a955551f9 100644 --- a/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock @@ -1,29 +1,30 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) elastic-transport (8.3.2) faraday (< 3) multi_json - elasticsearch (8.12.2) + elasticsearch (8.14.0) elastic-transport (~> 8.3) - elasticsearch-api (= 8.12.2) - elasticsearch-api (8.12.2) + elasticsearch-api (= 8.14.0) + elasticsearch-api (8.14.0) multi_json - excon (0.110.0) - faraday (2.9.0) + excon (0.111.0) + faraday (2.10.0) faraday-net_http (>= 2.0, < 3.2) + logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) faraday-net_http (3.1.0) net-http - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -84,13 +85,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -98,30 +99,34 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.0) lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) uri netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/debian-elasticsearch8/hooks/post_push index c0c5720b5..844756527 100644 --- a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch8/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.5-debian-elasticsearch8-amd64-1.0,v1.16-debian-elasticsearch8-amd64-2}; do +for tag in {v1.16.5-debian-elasticsearch8-amd64-1.1,v1.16-debian-elasticsearch8-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-forward/Gemfile.lock b/docker-image/v1.16/debian-forward/Gemfile.lock index 20bb95fe4..3a057961b 100644 --- a/docker-image/v1.16/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/debian-forward/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -60,13 +60,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -77,25 +77,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-forward/hooks/post_push b/docker-image/v1.16/debian-forward/hooks/post_push index bb926da1f..67fd5ae48 100644 --- a/docker-image/v1.16/debian-forward/hooks/post_push +++ b/docker-image/v1.16/debian-forward/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.5-debian-forward-amd64-1.0,v1.16-debian-forward-amd64-2}; do +for tag in {v1.16.5-debian-forward-amd64-1.1,v1.16-debian-forward-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-gcs/Gemfile.lock b/docker-image/v1.16/debian-gcs/Gemfile.lock index b490bc7d2..0a4aca427 100644 --- a/docker-image/v1.16/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/debian-gcs/Gemfile.lock @@ -1,20 +1,21 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - faraday (2.9.0) + faraday (2.10.0) faraday-net_http (>= 2.0, < 3.2) + logger faraday-net_http (3.1.0) net-http - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -63,7 +64,7 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-apis-core (0.14.1) + google-apis-core (0.15.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 1.9) httpclient (>= 2.8.1, < 3.a) @@ -71,22 +72,22 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml - google-apis-iamcredentials_v1 (0.20.0) - google-apis-core (>= 0.14.0, < 2.a) - google-apis-storage_v1 (0.37.0) - google-apis-core (>= 0.14.0, < 2.a) + google-apis-iamcredentials_v1 (0.21.0) + google-apis-core (>= 0.15.0, < 2.a) + google-apis-storage_v1 (0.40.0) + google-apis-core (>= 0.15.0, < 2.a) google-cloud-core (1.7.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (2.1.1) faraday (>= 1.0, < 3.a) google-cloud-errors (1.4.0) - google-cloud-storage (1.49.0) + google-cloud-storage (1.52.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-core (~> 0.13) google-apis-iamcredentials_v1 (~> 0.18) - google-apis-storage_v1 (~> 0.33) + google-apis-storage_v1 (~> 0.38) google-cloud-core (~> 1.6) googleauth (~> 1.9) mini_mime (~> 1.0) @@ -104,16 +105,16 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) httpclient (2.8.3) jsonpath (1.1.5) multi_json - jwt (2.8.1) + jwt (2.8.2) base64 - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -121,10 +122,11 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.0) lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) mini_mime (1.1.5) msgpack (1.7.2) multi_json (1.15.0) @@ -133,10 +135,11 @@ GEM netrc (0.11.0) oj (3.15.1) os (1.1.4) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -147,7 +150,8 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retriable (3.1.2) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) @@ -157,6 +161,7 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) trailblazer-option (0.1.2) diff --git a/docker-image/v1.16/debian-gcs/hooks/post_push b/docker-image/v1.16/debian-gcs/hooks/post_push index b479116c1..04e174e7a 100644 --- a/docker-image/v1.16/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/debian-gcs/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.5-debian-gcs-amd64-1.0,v1.16-debian-gcs-amd64-2}; do +for tag in {v1.16.5-debian-gcs-amd64-1.1,v1.16-debian-gcs-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-graylog/Gemfile.lock b/docker-image/v1.16/debian-graylog/Gemfile.lock index d9216c5c7..b89c8195f 100644 --- a/docker-image/v1.16/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/debian-graylog/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -65,14 +65,14 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.1) + json (2.7.2) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -83,25 +83,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-graylog/hooks/post_push b/docker-image/v1.16/debian-graylog/hooks/post_push index a70bb2fb0..2c7e1f953 100644 --- a/docker-image/v1.16/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/debian-graylog/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.5-debian-graylog-amd64-1.0,v1.16-debian-graylog-amd64-2}; do +for tag in {v1.16.5-debian-graylog-amd64-1.1,v1.16-debian-graylog-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-kafka/Dockerfile b/docker-image/v1.16/debian-kafka/Dockerfile index b0fa6ba16..5101a0a62 100644 --- a/docker-image/v1.16/debian-kafka/Dockerfile +++ b/docker-image/v1.16/debian-kafka/Dockerfile @@ -13,8 +13,8 @@ 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" \ - runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-dev" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev" \ + runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2" \ && export DEBIAN_FRONTEND=noninteractive && apt-get update \ && apt-get upgrade -y \ && apt-get install \ diff --git a/docker-image/v1.16/debian-kafka/Gemfile.lock b/docker-image/v1.16/debian-kafka/Gemfile.lock index 38c357751..f9c4fc4de 100644 --- a/docker-image/v1.16/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka/Gemfile.lock @@ -1,17 +1,17 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) avro (1.11.3) multi_json (~> 1.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -74,13 +74,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -92,26 +92,28 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) - mini_portile2 (2.8.5) + mime-types-data (3.2024.0702) + mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) rdkafka (0.11.1) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - recursive-open-struct (1.1.3) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan ruby-kafka (1.5.0) digest-crc serverengine (2.3.2) @@ -119,6 +121,7 @@ GEM sigdump (0.2.5) snappy (0.0.17) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-kafka/hooks/post_push b/docker-image/v1.16/debian-kafka/hooks/post_push index b32a2be06..2889a7fd8 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.5-debian-kafka-amd64-1.0,v1.16-debian-kafka-amd64-2}; do +for tag in {v1.16.5-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 b0fa6ba16..5101a0a62 100644 --- a/docker-image/v1.16/debian-kafka2/Dockerfile +++ b/docker-image/v1.16/debian-kafka2/Dockerfile @@ -13,8 +13,8 @@ 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" \ - runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-dev" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev" \ + runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2" \ && export DEBIAN_FRONTEND=noninteractive && apt-get update \ && apt-get upgrade -y \ && apt-get install \ diff --git a/docker-image/v1.16/debian-kafka2/Gemfile.lock b/docker-image/v1.16/debian-kafka2/Gemfile.lock index 38c357751..f9c4fc4de 100644 --- a/docker-image/v1.16/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka2/Gemfile.lock @@ -1,17 +1,17 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) avro (1.11.3) multi_json (~> 1.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -74,13 +74,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -92,26 +92,28 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) - mini_portile2 (2.8.5) + mime-types-data (3.2024.0702) + mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) rdkafka (0.11.1) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - recursive-open-struct (1.1.3) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan ruby-kafka (1.5.0) digest-crc serverengine (2.3.2) @@ -119,6 +121,7 @@ GEM sigdump (0.2.5) snappy (0.0.17) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-kafka2/hooks/post_push b/docker-image/v1.16/debian-kafka2/hooks/post_push index f22417259..0588e13ed 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.5-debian-kafka2-amd64-1.0,v1.16-debian-kafka2-amd64-2}; do +for tag in {v1.16.5-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 diff --git a/docker-image/v1.16/debian-kinesis/Gemfile.lock b/docker-image/v1.16/debian-kinesis/Gemfile.lock index 2c50bbd84..de001e417 100644 --- a/docker-image/v1.16/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/debian-kinesis/Gemfile.lock @@ -1,28 +1,28 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.903.0) - aws-sdk-core (3.191.5) + aws-partitions (1.954.0) + aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.66.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.55.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) + aws-sdk-firehose (1.75.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-kinesis (1.62.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -81,14 +81,14 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -99,25 +99,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-kinesis/hooks/post_push b/docker-image/v1.16/debian-kinesis/hooks/post_push index 73676c10c..af80086cf 100644 --- a/docker-image/v1.16/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/debian-kinesis/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.5-debian-kinesis-amd64-1.0,v1.16-debian-kinesis-amd64-2}; do +for tag in {v1.16.5-debian-kinesis-amd64-1.1,v1.16-debian-kinesis-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-logentries/Gemfile.lock b/docker-image/v1.16/debian-logentries/Gemfile.lock index 20bb95fe4..3a057961b 100644 --- a/docker-image/v1.16/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/debian-logentries/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -60,13 +60,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -77,25 +77,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-logentries/hooks/post_push b/docker-image/v1.16/debian-logentries/hooks/post_push index 8906ccdf3..aa011cedb 100644 --- a/docker-image/v1.16/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/debian-logentries/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.5-debian-logentries-amd64-1.0,v1.16-debian-logentries-amd64-2}; do +for tag in {v1.16.5-debian-logentries-amd64-1.1,v1.16-debian-logentries-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-loggly/Gemfile.lock b/docker-image/v1.16/debian-loggly/Gemfile.lock index 476c3c531..6f7c69caf 100644 --- a/docker-image/v1.16/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/debian-loggly/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -63,13 +63,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -80,26 +80,29 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (2.9.4) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-loggly/hooks/post_push b/docker-image/v1.16/debian-loggly/hooks/post_push index 0a3c98472..c3a23d016 100644 --- a/docker-image/v1.16/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/debian-loggly/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.5-debian-loggly-amd64-1.0,v1.16-debian-loggly-amd64-2}; do +for tag in {v1.16.5-debian-loggly-amd64-1.1,v1.16-debian-loggly-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-logzio/Gemfile.lock b/docker-image/v1.16/debian-logzio/Gemfile.lock index 99731ced6..8cdb09d27 100644 --- a/docker-image/v1.16/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/debian-logzio/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) - cool.io (1.8.0) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -65,13 +65,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -82,27 +82,30 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (4.0.2) connection_pool (~> 2.2) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-logzio/hooks/post_push b/docker-image/v1.16/debian-logzio/hooks/post_push index 9ef0efeef..6e9eeb439 100644 --- a/docker-image/v1.16/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/debian-logzio/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.5-debian-logzio-amd64-1.0,v1.16-debian-logzio-amd64-2}; do +for tag in {v1.16.5-debian-logzio-amd64-1.1,v1.16-debian-logzio-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-opensearch/Gemfile.lock b/docker-image/v1.16/debian-opensearch/Gemfile.lock index 1d47ec335..6ae71d2ab 100644 --- a/docker-image/v1.16/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/debian-opensearch/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.903.0) - aws-sdk-core (3.191.5) + aws-partitions (1.954.0) + aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -13,12 +13,13 @@ GEM aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - excon (0.110.0) - faraday (2.9.0) + excon (0.111.0) + faraday (2.10.0) faraday-net_http (>= 2.0, < 3.2) + logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) @@ -27,7 +28,7 @@ GEM faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) faraday (>= 2.0, < 3) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -88,14 +89,14 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -103,33 +104,37 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.0) lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) uri netrc (0.11.0) oj (3.15.1) - opensearch-ruby (3.1.0) + opensearch-ruby (3.3.0) faraday (>= 1.0, < 3) multi_json (>= 1.0) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-opensearch/hooks/post_push b/docker-image/v1.16/debian-opensearch/hooks/post_push index 272160235..d640ca7fc 100644 --- a/docker-image/v1.16/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/debian-opensearch/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.5-debian-opensearch-amd64-1.0,v1.16-debian-opensearch-amd64-2}; do +for tag in {v1.16.5-debian-opensearch-amd64-1.1,v1.16-debian-opensearch-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-papertrail/Gemfile.lock b/docker-image/v1.16/debian-papertrail/Gemfile.lock index 351e8017a..8c0a4d2f6 100644 --- a/docker-image/v1.16/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/debian-papertrail/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -66,13 +66,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -83,25 +83,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-papertrail/hooks/post_push b/docker-image/v1.16/debian-papertrail/hooks/post_push index 46f62555d..69cf558f7 100644 --- a/docker-image/v1.16/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/debian-papertrail/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.5-debian-papertrail-amd64-1.0,v1.16-debian-papertrail-amd64-2}; do +for tag in {v1.16.5-debian-papertrail-amd64-1.1,v1.16-debian-papertrail-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-s3/Gemfile.lock b/docker-image/v1.16/debian-s3/Gemfile.lock index c199ea4b1..3b8857551 100644 --- a/docker-image/v1.16/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/debian-s3/Gemfile.lock @@ -1,32 +1,32 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.903.0) - aws-sdk-core (3.191.5) + aws-partitions (1.954.0) + aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.78.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.146.1) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-kms (1.88.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.156.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.8) - aws-sdk-sqs (1.70.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) + aws-sigv4 (~> 1.5) + aws-sdk-sqs (1.80.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -83,14 +83,14 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -101,25 +101,28 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) systemd-journal (1.4.2) ffi (~> 1.9) tzinfo (2.0.6) diff --git a/docker-image/v1.16/debian-s3/hooks/post_push b/docker-image/v1.16/debian-s3/hooks/post_push index 3ff058007..55e728baa 100644 --- a/docker-image/v1.16/debian-s3/hooks/post_push +++ b/docker-image/v1.16/debian-s3/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.5-debian-s3-amd64-1.0,v1.16-debian-s3-amd64-2}; do +for tag in {v1.16.5-debian-s3-amd64-1.1,v1.16-debian-s3-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-syslog/Gemfile.lock b/docker-image/v1.16/debian-syslog/Gemfile.lock index 8fcc1f664..de091e8f9 100644 --- a/docker-image/v1.16/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/debian-syslog/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.2.3) - cool.io (1.8.0) + concurrent-ruby (1.3.3) + cool.io (1.8.1) domain_name (0.6.20240107) - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -63,13 +63,13 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jsonpath (1.1.5) multi_json - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -80,15 +80,16 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0702) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) - prometheus-client (4.2.2) - public_suffix (5.0.4) - rake (13.1.0) - recursive-open-struct (1.1.3) + prometheus-client (4.2.3) + base64 + public_suffix (6.0.0) + rake (13.2.1) + recursive-open-struct (1.2.2) remote_syslog_sender (1.2.2) syslog_protocol rest-client (2.1.0) @@ -96,11 +97,13 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.2.9) + strscan serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + strscan (3.1.0) syslog_protocol (0.9.2) systemd-journal (1.4.2) ffi (~> 1.9) diff --git a/docker-image/v1.16/debian-syslog/hooks/post_push b/docker-image/v1.16/debian-syslog/hooks/post_push index a4ebb187c..b64d69885 100644 --- a/docker-image/v1.16/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/debian-syslog/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.5-debian-syslog-amd64-1.0,v1.16-debian-syslog-amd64-2}; do +for tag in {v1.16.5-debian-syslog-amd64-1.1,v1.16-debian-syslog-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 From f51c41cbccc73d5254f79e92ba9f6293de7e8774 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Thu, 11 Jul 2024 14:51:36 +0900 Subject: [PATCH 06/26] Fix graylog connecting issue Closes: #1479 Feedback from @mszyzdek ref. https://github.com/fluent/fluentd-kubernetes-daemonset/issues/1479#issuecomment-1996018837 * graylog flavour of fluentd-kubernetes-daemonset uses gelf 3.0.0 and this version of gelf gem has Fixnum in code, https://github.com/graylog-labs/gelf-rb/commit/7cc3cbb63556f54967699e034b1d51cf30bf1c6f * in ruby 3.2 Fixnum was removed after previous deprecation in version 2.4 https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/ * ruby in newest fluentd was upgraded to 3.2 https://github.com/fluent/fluentd-docker-image/commit/4f1d5e8dcdbbed10d1458edaecfb771f6ba9f05e so it also happened in fluentd-kubernetes-daemonset * gelf 3.0.0 cannot work with ruby 3.2+ so we can see sad error on container start NOTE: Even though gelf was updated to 3.1.0, still it has problem with reloading Fluentd configuration with SIGUSR2. This is known issue since Fluentd 1.8.0. ref. https://github.com/fluent/fluentd/issues/2709 Signed-off-by: Kentaro Hayashi --- templates/Gemfile.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Gemfile.erb b/templates/Gemfile.erb index d80b9a48c..1eb5ed4c3 100644 --- a/templates/Gemfile.erb +++ b/templates/Gemfile.erb @@ -45,7 +45,7 @@ gem "fluent-plugin-s3", "~> 1.7.0" <% when "gcs" %> gem "fluent-plugin-gcs", "0.4.2" <% when "graylog" %> -gem "gelf", "3.0.0" +gem "gelf" gem "fluent-plugin-gelf-hs", "~> 1.0.7" <% when "logzio" %> gem "fluent-plugin-logzio", "~> 0.2.2" From 0146eaddb4c2e6302d7a148fa40237037e7beb10 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 12 Jul 2024 17:55:17 +0900 Subject: [PATCH 07/26] Bump version to 1.16.5-debian-graylog-1.2 Signed-off-by: Kentaro Hayashi --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3bdc2e25f..d30b90992 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ X86_IMAGES := \ v1.16/debian-syslog:v1.16.5-debian-syslog-amd64-1.1,v1.16-debian-syslog-amd64-2 \ v1.16/debian-forward:v1.16.5-debian-forward-amd64-1.1,v1.16-debian-forward-amd64-2 \ v1.16/debian-gcs:v1.16.5-debian-gcs-amd64-1.1,v1.16-debian-gcs-amd64-2 \ - v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.1,v1.16-debian-graylog-amd64-2 \ + v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.2,v1.16-debian-graylog-amd64-2 \ v1.16/debian-papertrail:v1.16.5-debian-papertrail-amd64-1.1,v1.16-debian-papertrail-amd64-2 \ v1.16/debian-logzio:v1.16.5-debian-logzio-amd64-1.1,v1.16-debian-logzio-amd64-2 \ v1.16/debian-kafka:v1.16.5-debian-kafka-amd64-1.1,v1.16-debian-kafka-amd64-2 \ @@ -44,7 +44,7 @@ ARM64_IMAGES := \ v1.16/arm64/debian-syslog:v1.16.5-debian-syslog-arm64-1.1,v1.16-debian-syslog-arm64-2 \ v1.16/arm64/debian-forward:v1.16.5-debian-forward-arm64-1.1,v1.16-debian-forward-arm64-2 \ v1.16/arm64/debian-gcs:v1.16.5-debian-gcs-arm64-1.1,v1.16-debian-gcs-arm64-2 \ - v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.1,v1.16-debian-graylog-arm64-2 \ + v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.2,v1.16-debian-graylog-arm64-2 \ v1.16/arm64/debian-papertrail:v1.16.5-debian-papertrail-arm64-1.1,v1.16-debian-papertrail-arm64-2 \ v1.16/arm64/debian-logzio:v1.16.5-debian-logzio-arm64-1.1,v1.16-debian-logzio-arm64-2 \ v1.16/arm64/debian-kafka:v1.16.5-debian-kafka-arm64-1.1,v1.16-debian-kafka-arm64-2 \ From cf9b12789192b1739ad5876bba14a781ccb251b5 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 12 Jul 2024 17:58:42 +0900 Subject: [PATCH 08/26] Add v1.16.5-debian-graylog-1.2 images Signed-off-by: Kentaro Hayashi --- docker-image/v1.16/arm64/debian-graylog/Gemfile | 2 +- docker-image/v1.16/arm64/debian-graylog/Gemfile.lock | 4 ++-- docker-image/v1.16/arm64/debian-graylog/hooks/post_push | 2 +- docker-image/v1.16/debian-graylog/Gemfile | 2 +- docker-image/v1.16/debian-graylog/Gemfile.lock | 4 ++-- docker-image/v1.16/debian-graylog/hooks/post_push | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-image/v1.16/arm64/debian-graylog/Gemfile b/docker-image/v1.16/arm64/debian-graylog/Gemfile index c5d0ff1f4..6a34f1c26 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Gemfile +++ b/docker-image/v1.16/arm64/debian-graylog/Gemfile @@ -15,7 +15,7 @@ gem "fluent-plugin-record-modifier", "~> 2.1.0" gem "fluent-plugin-detect-exceptions", "~> 0.0.13" gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0" gem "fluent-plugin-parser-cri", "~> 0.1.0" -gem "gelf", "3.0.0" +gem "gelf" gem "fluent-plugin-gelf-hs", "~> 1.0.7" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" diff --git a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock index b89c8195f..5816f6d5a 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock @@ -56,7 +56,7 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - gelf (3.0.0) + gelf (3.1.0) json http (5.2.0) addressable (~> 2.8) @@ -132,7 +132,7 @@ DEPENDENCIES fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) fluentd (= 1.16.5) - gelf (= 3.0.0) + gelf oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push b/docker-image/v1.16/arm64/debian-graylog/hooks/post_push index 587aa239a..5e677ffc7 100644 --- a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-graylog/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.5-debian-graylog-arm64-1.1,v1.16-debian-graylog-arm64-2}; do +for tag in {v1.16.5-debian-graylog-arm64-1.2,v1.16-debian-graylog-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-graylog/Gemfile b/docker-image/v1.16/debian-graylog/Gemfile index c5d0ff1f4..6a34f1c26 100644 --- a/docker-image/v1.16/debian-graylog/Gemfile +++ b/docker-image/v1.16/debian-graylog/Gemfile @@ -15,7 +15,7 @@ gem "fluent-plugin-record-modifier", "~> 2.1.0" gem "fluent-plugin-detect-exceptions", "~> 0.0.13" gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0" gem "fluent-plugin-parser-cri", "~> 0.1.0" -gem "gelf", "3.0.0" +gem "gelf" gem "fluent-plugin-gelf-hs", "~> 1.0.7" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" diff --git a/docker-image/v1.16/debian-graylog/Gemfile.lock b/docker-image/v1.16/debian-graylog/Gemfile.lock index b89c8195f..5816f6d5a 100644 --- a/docker-image/v1.16/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/debian-graylog/Gemfile.lock @@ -56,7 +56,7 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - gelf (3.0.0) + gelf (3.1.0) json http (5.2.0) addressable (~> 2.8) @@ -132,7 +132,7 @@ DEPENDENCIES fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) fluentd (= 1.16.5) - gelf (= 3.0.0) + gelf oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-graylog/hooks/post_push b/docker-image/v1.16/debian-graylog/hooks/post_push index 2c7e1f953..0e85a6899 100644 --- a/docker-image/v1.16/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/debian-graylog/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.5-debian-graylog-amd64-1.1,v1.16-debian-graylog-amd64-2}; do +for tag in {v1.16.5-debian-graylog-amd64-1.2,v1.16-debian-graylog-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 From ef389ee13c10a4bf8489bb0ea7009617dc92ac0b Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 12 Jul 2024 18:33:53 +0900 Subject: [PATCH 09/26] Backport #1507 to deploy specific image for v1.16 Signed-off-by: Kentaro Hayashi --- .github/workflows/docker-build.yml | 55 ++++++++++++++++++------------ 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index c1b890d56..9146ab9e9 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -10,31 +10,42 @@ env: jobs: define-matrix: runs-on: ubuntu-latest + env: + ALL_COMPONENTS: > + [ + "debian-azureblob", + "debian-cloudwatch", + "debian-elasticsearch7", + "debian-elasticsearch8", + "debian-forward", + "debian-gcs", + "debian-graylog", + "debian-kafka", + "debian-kafka2", + "debian-kinesis", + "debian-logentries", + "debian-loggly", + "debian-logzio", + "debian-opensearch", + "debian-papertrail", + "debian-s3", + "debian-syslog" + ] outputs: - components: ${{ steps.set-components.outputs.components }} + components: > + ${{ steps.arrange-components.outputs.for_all == 'true' && env.ALL_COMPONENTS + || format('["{0}"]', steps.arrange-components.outputs.component) }} steps: - - id: set-components + - id: arrange-components run: | - components=$(echo '[ - "debian-azureblob", - "debian-cloudwatch", - "debian-elasticsearch7", - "debian-elasticsearch8", - "debian-forward", - "debian-gcs", - "debian-graylog", - "debian-kafka", - "debian-kafka2", - "debian-kinesis", - "debian-logentries", - "debian-loggly", - "debian-logzio", - "debian-opensearch", - "debian-papertrail", - "debian-s3", - "debian-syslog" - ]' | jq -c) - echo "components=$components" >> "$GITHUB_OUTPUT" + echo "for_all=true" >> "$GITHUB_OUTPUT" + for component in ${{ join(fromJSON(env.ALL_COMPONENTS), ' ') }}; do + if [[ ${{ env.github.ref_name }} == *"$component"* ]]; then + echo "for_all=false" >> "$GITHUB_OUTPUT" + echo "component=$component" >> "$GITHUB_OUTPUT" + break + fi + done amd64: needs: define-matrix runs-on: ubuntu-latest From ffafcccddbd2c57f84f94cc6e5ceb92247db18f5 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 12 Jul 2024 18:48:38 +0900 Subject: [PATCH 10/26] github: fix variable name It should be github.ref_name instead of env.github.ref_name. Signed-off-by: Kentaro Hayashi --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 9146ab9e9..212f73c8b 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -40,7 +40,7 @@ jobs: run: | echo "for_all=true" >> "$GITHUB_OUTPUT" for component in ${{ join(fromJSON(env.ALL_COMPONENTS), ' ') }}; do - if [[ ${{ env.github.ref_name }} == *"$component"* ]]; then + if [[ ${{ github.ref_name }} == *"$component"* ]]; then echo "for_all=false" >> "$GITHUB_OUTPUT" echo "component=$component" >> "$GITHUB_OUTPUT" break From d643853e2539baeed410aa99ae9e95eaa8ea9600 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 10 Jul 2024 19:00:17 +0900 Subject: [PATCH 11/26] Fix incorrect environment name It is a long standing typo. Closes: #1383 Signed-off-by: Kentaro Hayashi --- fluentd-daemonset-forward.yaml | 4 ++-- templates/conf/fluent.conf.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fluentd-daemonset-forward.yaml b/fluentd-daemonset-forward.yaml index ad2daf24f..21eeb8930 100644 --- a/fluentd-daemonset-forward.yaml +++ b/fluentd-daemonset-forward.yaml @@ -30,9 +30,9 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: FLUENT_FOWARD_HOST + - name: FLUENT_FORWARD_HOST value: "REMOTE_ENDPOINT" - - name: FLUENT_FOWARD_PORT + - name: FLUENT_FORWARD_PORT value: "18080" resources: limits: diff --git a/templates/conf/fluent.conf.erb b/templates/conf/fluent.conf.erb index 91813c228..4ea9dea47 100644 --- a/templates/conf/fluent.conf.erb +++ b/templates/conf/fluent.conf.erb @@ -375,8 +375,8 @@ @id out_fwd @log_level info - host "#{ENV['FLUENT_FOWARD_HOST']}" - port "#{ENV['FLUENT_FOWARD_PORT']}" + host "#{ENV['FLUENT_FORWARD_HOST'] || ENV['FLUENT_FOWARD_HOST']}" + port "#{ENV['FLUENT_FORWARD_PORT'] || ENV['FLUENT_FOWARD_PORT']}" flush_interval "#{ENV['FLUENT_FORWARD_FLUSH_INTERVAL'] || use_default}" From 2e5b17065e98eb4fa0d3910d99b994b418a613d1 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 17 Jul 2024 12:12:46 +0900 Subject: [PATCH 12/26] Change jemalloc opt-in for now There is a known bug that combination with jemalloc and fluent-plugin-systemd causes free(): invalid crash for a long time. The problematic code is identified but the root cause is not fixed yet. There is a workaround for this - disable jemalloc explicitly. LD_PRELOAD= stop to use jemalloc. If you want to use jemalloc, set it via env like this: containers: - name: fluentd image: fluent/fluentd-kubernetes-daemonset:v1-debian-forward env: - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName - name: FLUENT_FORWARD_HOST value: "REMOTE_ENDPOINT" - name: FLUENT_FORWARD_PORT value: "18080" - name: LD_PRELOAD value: "/usr/lib/libjemalloc.so.2" Related issues: https://github.com/fluent/fluentd-docker-image/issues/378 https://github.com/fluent/fluent-package-builder/issues/369 https://github.com/fluent-plugins-nursery/fluent-plugin-systemd/issues/110 https://github.com/ledbettj/systemd-journal/issues/93 https://github.com/fluent/fluentd-kubernetes-daemonset/issues/1478 Signed-off-by: Kentaro Hayashi --- templates/Dockerfile.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/Dockerfile.erb b/templates/Dockerfile.erb index dba01f613..ae1b44285 100644 --- a/templates/Dockerfile.erb +++ b/templates/Dockerfile.erb @@ -72,6 +72,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] From 8baa380afe8e72f0b7ae42ca0cad06fdcd40e35c Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 17 Jul 2024 17:49:48 +0900 Subject: [PATCH 13/26] Bump version to v1.16.5-1.3 Signed-off-by: Kentaro Hayashi --- Makefile | 68 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index d30b90992..04d1ad988 100644 --- a/Makefile +++ b/Makefile @@ -12,44 +12,44 @@ IMAGE_NAME := fluent/fluentd-kubernetes X86_IMAGES := \ - v1.16/debian-azureblob:v1.16.5-debian-azureblob-amd64-1.1,v1.16-debian-azureblob-amd64-2 \ - v1.16/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-amd64-1.1,v1.16-debian-elasticsearch8-amd64-2 \ - v1.16/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-amd64-1.1,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ - v1.16/debian-opensearch:v1.16.5-debian-opensearch-amd64-1.1,v1.16-debian-opensearch-amd64-2 \ - v1.16/debian-loggly:v1.16.5-debian-loggly-amd64-1.1,v1.16-debian-loggly-amd64-2 \ - v1.16/debian-logentries:v1.16.5-debian-logentries-amd64-1.1,v1.16-debian-logentries-amd64-2 \ - v1.16/debian-cloudwatch:v1.16.5-debian-cloudwatch-amd64-1.1,v1.16-debian-cloudwatch-amd64-2 \ - v1.16/debian-s3:v1.16.5-debian-s3-amd64-1.1,v1.16-debian-s3-amd64-2 \ - v1.16/debian-syslog:v1.16.5-debian-syslog-amd64-1.1,v1.16-debian-syslog-amd64-2 \ - v1.16/debian-forward:v1.16.5-debian-forward-amd64-1.1,v1.16-debian-forward-amd64-2 \ - v1.16/debian-gcs:v1.16.5-debian-gcs-amd64-1.1,v1.16-debian-gcs-amd64-2 \ - v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.2,v1.16-debian-graylog-amd64-2 \ - v1.16/debian-papertrail:v1.16.5-debian-papertrail-amd64-1.1,v1.16-debian-papertrail-amd64-2 \ - v1.16/debian-logzio:v1.16.5-debian-logzio-amd64-1.1,v1.16-debian-logzio-amd64-2 \ - v1.16/debian-kafka:v1.16.5-debian-kafka-amd64-1.1,v1.16-debian-kafka-amd64-2 \ - v1.16/debian-kafka2:v1.16.5-debian-kafka2-amd64-1.1,v1.16-debian-kafka2-amd64-2 \ - v1.16/debian-kinesis:v1.16.5-debian-kinesis-amd64-1.1,v1.16-debian-kinesis-amd64-2 + v1.16/debian-azureblob:v1.16.5-debian-azureblob-amd64-1.3,v1.16-debian-azureblob-amd64-2 \ + v1.16/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-amd64-1.3,v1.16-debian-elasticsearch8-amd64-2 \ + v1.16/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-amd64-1.3,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ + v1.16/debian-opensearch:v1.16.5-debian-opensearch-amd64-1.3,v1.16-debian-opensearch-amd64-2 \ + v1.16/debian-loggly:v1.16.5-debian-loggly-amd64-1.3,v1.16-debian-loggly-amd64-2 \ + v1.16/debian-logentries:v1.16.5-debian-logentries-amd64-1.3,v1.16-debian-logentries-amd64-2 \ + v1.16/debian-cloudwatch:v1.16.5-debian-cloudwatch-amd64-1.3,v1.16-debian-cloudwatch-amd64-2 \ + v1.16/debian-s3:v1.16.5-debian-s3-amd64-1.3,v1.16-debian-s3-amd64-2 \ + v1.16/debian-syslog:v1.16.5-debian-syslog-amd64-1.3,v1.16-debian-syslog-amd64-2 \ + v1.16/debian-forward:v1.16.5-debian-forward-amd64-1.3,v1.16-debian-forward-amd64-2 \ + v1.16/debian-gcs:v1.16.5-debian-gcs-amd64-1.3,v1.16-debian-gcs-amd64-2 \ + v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.3,v1.16-debian-graylog-amd64-2 \ + v1.16/debian-papertrail:v1.16.5-debian-papertrail-amd64-1.3,v1.16-debian-papertrail-amd64-2 \ + v1.16/debian-logzio:v1.16.5-debian-logzio-amd64-1.3,v1.16-debian-logzio-amd64-2 \ + v1.16/debian-kafka:v1.16.5-debian-kafka-amd64-1.3,v1.16-debian-kafka-amd64-2 \ + v1.16/debian-kafka2:v1.16.5-debian-kafka2-amd64-1.3,v1.16-debian-kafka2-amd64-2 \ + v1.16/debian-kinesis:v1.16.5-debian-kinesis-amd64-1.3,v1.16-debian-kinesis-amd64-2 # :,,,... ARM64_IMAGES := \ - v1.16/arm64/debian-azureblob:v1.16.5-debian-azureblob-arm64-1.1,v1.16-debian-azureblob-arm64-2 \ - v1.16/arm64/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-arm64-1.1,v1.16-debian-elasticsearch8-arm64-2 \ - v1.16/arm64/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-arm64-1.1,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ - v1.16/arm64/debian-opensearch:v1.16.5-debian-opensearch-arm64-1.1,v1.16-debian-opensearch-arm64-2 \ - v1.16/arm64/debian-loggly:v1.16.5-debian-loggly-arm64-1.1,v1.16-debian-loggly-arm64-2 \ - v1.16/arm64/debian-logentries:v1.16.5-debian-logentries-arm64-1.1,v1.16-debian-logentries-arm64-2 \ - v1.16/arm64/debian-cloudwatch:v1.16.5-debian-cloudwatch-arm64-1.1,v1.16-debian-cloudwatch-arm64-2 \ - v1.16/arm64/debian-s3:v1.16.5-debian-s3-arm64-1.1,v1.16-debian-s3-arm64-2 \ - v1.16/arm64/debian-syslog:v1.16.5-debian-syslog-arm64-1.1,v1.16-debian-syslog-arm64-2 \ - v1.16/arm64/debian-forward:v1.16.5-debian-forward-arm64-1.1,v1.16-debian-forward-arm64-2 \ - v1.16/arm64/debian-gcs:v1.16.5-debian-gcs-arm64-1.1,v1.16-debian-gcs-arm64-2 \ - v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.2,v1.16-debian-graylog-arm64-2 \ - v1.16/arm64/debian-papertrail:v1.16.5-debian-papertrail-arm64-1.1,v1.16-debian-papertrail-arm64-2 \ - v1.16/arm64/debian-logzio:v1.16.5-debian-logzio-arm64-1.1,v1.16-debian-logzio-arm64-2 \ - v1.16/arm64/debian-kafka:v1.16.5-debian-kafka-arm64-1.1,v1.16-debian-kafka-arm64-2 \ - v1.16/arm64/debian-kafka2:v1.16.5-debian-kafka2-arm64-1.1,v1.16-debian-kafka2-arm64-2 \ - v1.16/arm64/debian-kinesis:v1.16.5-debian-kinesis-arm64-1.1,v1.16-debian-kinesis-arm64-2 + v1.16/arm64/debian-azureblob:v1.16.5-debian-azureblob-arm64-1.3,v1.16-debian-azureblob-arm64-2 \ + v1.16/arm64/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-arm64-1.3,v1.16-debian-elasticsearch8-arm64-2 \ + v1.16/arm64/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-arm64-1.3,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ + v1.16/arm64/debian-opensearch:v1.16.5-debian-opensearch-arm64-1.3,v1.16-debian-opensearch-arm64-2 \ + v1.16/arm64/debian-loggly:v1.16.5-debian-loggly-arm64-1.3,v1.16-debian-loggly-arm64-2 \ + v1.16/arm64/debian-logentries:v1.16.5-debian-logentries-arm64-1.3,v1.16-debian-logentries-arm64-2 \ + v1.16/arm64/debian-cloudwatch:v1.16.5-debian-cloudwatch-arm64-1.3,v1.16-debian-cloudwatch-arm64-2 \ + v1.16/arm64/debian-s3:v1.16.5-debian-s3-arm64-1.3,v1.16-debian-s3-arm64-2 \ + v1.16/arm64/debian-syslog:v1.16.5-debian-syslog-arm64-1.3,v1.16-debian-syslog-arm64-2 \ + v1.16/arm64/debian-forward:v1.16.5-debian-forward-arm64-1.3,v1.16-debian-forward-arm64-2 \ + v1.16/arm64/debian-gcs:v1.16.5-debian-gcs-arm64-1.3,v1.16-debian-gcs-arm64-2 \ + v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.3,v1.16-debian-graylog-arm64-2 \ + v1.16/arm64/debian-papertrail:v1.16.5-debian-papertrail-arm64-1.3,v1.16-debian-papertrail-arm64-2 \ + v1.16/arm64/debian-logzio:v1.16.5-debian-logzio-arm64-1.3,v1.16-debian-logzio-arm64-2 \ + v1.16/arm64/debian-kafka:v1.16.5-debian-kafka-arm64-1.3,v1.16-debian-kafka-arm64-2 \ + v1.16/arm64/debian-kafka2:v1.16.5-debian-kafka2-arm64-1.3,v1.16-debian-kafka2-arm64-2 \ + v1.16/arm64/debian-kinesis:v1.16.5-debian-kinesis-arm64-1.3,v1.16-debian-kinesis-arm64-2 ALL_IMAGES := $(X86_IMAGES) $(ARM64_IMAGES) From f82c2ad67f0345d6c8a4497bfc45cbfffaf9ce57 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 17 Jul 2024 17:58:20 +0900 Subject: [PATCH 14/26] Add v1.16.5-1.3 images Signed-off-by: Kentaro Hayashi --- README.md | 74 +++++++++---------- .../v1.16/arm64/debian-azureblob/Dockerfile | 3 + .../arm64/debian-azureblob/hooks/post_push | 2 +- .../v1.16/arm64/debian-cloudwatch/Dockerfile | 3 + .../arm64/debian-cloudwatch/Gemfile.lock | 2 +- .../arm64/debian-cloudwatch/hooks/post_push | 2 +- .../arm64/debian-elasticsearch7/Dockerfile | 3 + .../debian-elasticsearch7/hooks/post_push | 2 +- .../arm64/debian-elasticsearch8/Dockerfile | 3 + .../arm64/debian-elasticsearch8/Gemfile.lock | 2 +- .../debian-elasticsearch8/hooks/post_push | 2 +- .../v1.16/arm64/debian-forward/Dockerfile | 3 + .../arm64/debian-forward/conf/fluent.conf | 4 +- .../arm64/debian-forward/hooks/post_push | 2 +- .../v1.16/arm64/debian-gcs/Dockerfile | 3 + .../v1.16/arm64/debian-gcs/hooks/post_push | 2 +- .../v1.16/arm64/debian-graylog/Dockerfile | 3 + .../arm64/debian-graylog/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka/Dockerfile | 3 + .../v1.16/arm64/debian-kafka/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka2/Dockerfile | 3 + .../v1.16/arm64/debian-kafka2/hooks/post_push | 2 +- .../v1.16/arm64/debian-kinesis/Dockerfile | 3 + .../v1.16/arm64/debian-kinesis/Gemfile.lock | 2 +- .../arm64/debian-kinesis/hooks/post_push | 2 +- .../v1.16/arm64/debian-logentries/Dockerfile | 3 + .../arm64/debian-logentries/hooks/post_push | 2 +- .../v1.16/arm64/debian-loggly/Dockerfile | 3 + .../v1.16/arm64/debian-loggly/hooks/post_push | 2 +- .../v1.16/arm64/debian-logzio/Dockerfile | 3 + .../v1.16/arm64/debian-logzio/hooks/post_push | 2 +- .../v1.16/arm64/debian-opensearch/Dockerfile | 3 + .../arm64/debian-opensearch/Gemfile.lock | 4 +- .../arm64/debian-opensearch/hooks/post_push | 2 +- .../v1.16/arm64/debian-papertrail/Dockerfile | 3 + .../arm64/debian-papertrail/hooks/post_push | 2 +- docker-image/v1.16/arm64/debian-s3/Dockerfile | 3 + .../v1.16/arm64/debian-s3/Gemfile.lock | 2 +- .../v1.16/arm64/debian-s3/hooks/post_push | 2 +- .../v1.16/arm64/debian-syslog/Dockerfile | 3 + .../v1.16/arm64/debian-syslog/hooks/post_push | 2 +- .../v1.16/debian-azureblob/Dockerfile | 3 + .../v1.16/debian-azureblob/hooks/post_push | 2 +- .../v1.16/debian-cloudwatch/Dockerfile | 3 + .../v1.16/debian-cloudwatch/Gemfile.lock | 2 +- .../v1.16/debian-cloudwatch/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch7/Dockerfile | 3 + .../debian-elasticsearch7/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch8/Dockerfile | 3 + .../v1.16/debian-elasticsearch8/Gemfile.lock | 2 +- .../debian-elasticsearch8/hooks/post_push | 2 +- docker-image/v1.16/debian-forward/Dockerfile | 3 + .../v1.16/debian-forward/conf/fluent.conf | 4 +- .../v1.16/debian-forward/hooks/post_push | 2 +- docker-image/v1.16/debian-gcs/Dockerfile | 3 + docker-image/v1.16/debian-gcs/hooks/post_push | 2 +- docker-image/v1.16/debian-graylog/Dockerfile | 3 + .../v1.16/debian-graylog/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka/Dockerfile | 3 + .../v1.16/debian-kafka/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka2/Dockerfile | 3 + .../v1.16/debian-kafka2/hooks/post_push | 2 +- docker-image/v1.16/debian-kinesis/Dockerfile | 3 + .../v1.16/debian-kinesis/Gemfile.lock | 2 +- .../v1.16/debian-kinesis/hooks/post_push | 2 +- .../v1.16/debian-logentries/Dockerfile | 3 + .../v1.16/debian-logentries/hooks/post_push | 2 +- docker-image/v1.16/debian-loggly/Dockerfile | 3 + .../v1.16/debian-loggly/hooks/post_push | 2 +- docker-image/v1.16/debian-logzio/Dockerfile | 3 + .../v1.16/debian-logzio/hooks/post_push | 2 +- .../v1.16/debian-opensearch/Dockerfile | 3 + .../v1.16/debian-opensearch/Gemfile.lock | 4 +- .../v1.16/debian-opensearch/hooks/post_push | 2 +- .../v1.16/debian-papertrail/Dockerfile | 3 + .../v1.16/debian-papertrail/hooks/post_push | 2 +- docker-image/v1.16/debian-s3/Dockerfile | 3 + docker-image/v1.16/debian-s3/Gemfile.lock | 2 +- docker-image/v1.16/debian-s3/hooks/post_push | 2 +- docker-image/v1.16/debian-syslog/Dockerfile | 3 + .../v1.16/debian-syslog/hooks/post_push | 2 +- 81 files changed, 189 insertions(+), 87 deletions(-) diff --git a/README.md b/README.md index 77a962a5d..16e9a522f 100644 --- a/README.md +++ b/README.md @@ -25,130 +25,130 @@ If you want to use above non published images, build it by yourself. Dockerfile ##### Multi-Arch images - `Azureblob` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-2` - `Elasticsearch8` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-2` - `Elasticsearch7` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch` - `Opensearch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-2` - `Cloudwatch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-2` - `Forward` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-2` - `Gcs` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-2` - `Graylog` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-2` - `Kafka` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-2` - `Kafka2` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-2` - `Kinesis` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-2` ##### x86_64 images - `Azureblob` [Dockerfile](docker-image/v1.16/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-amd64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-amd64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-amd64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-amd64` - `Opensearch` [Dockerfile](docker-image/v1.16/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-amd64-2` - `Loggly` [Dockerfile](docker-image/v1.16/debian-loggly/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-loggly-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-loggly-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-loggly-amd64-2` - `Logentries` [Dockerfile](docker-image/v1.16/debian-logentries/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logentries-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logentries-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-logentries-amd64-2` - `Cloudwatch` [Dockerfile](docker-image/v1.16/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-amd64-2` - `S3` [Dockerfile](docker-image/v1.16/debian-s3/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-s3-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-s3-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-s3-amd64-2` - `Syslog` [Dockerfile](docker-image/v1.16/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-amd64-2` - `Gcs` [Dockerfile](docker-image/v1.16/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-amd64-2` - `Graylog` [Dockerfile](docker-image/v1.16/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-amd64-2` - `Papertrail` [Dockerfile](docker-image/v1.16/debian-papertrail/Dockerfile) - `Logzio` [Dockerfile](docker-image/v1.16/debian-logzio/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logzio-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logzio-amd64-1.3` - `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.5-debian-kafka-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-amd64-1.3` - `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.5-debian-kafka2-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-amd64-1.3` - `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.5-debian-kinesis-amd64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-amd64-2` ##### arm64 images - `Azureblob` [Dockerfile](docker-image/v1.16/arm64/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-arm64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-arm64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-arm64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-arm64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-arm64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-arm64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-arm64` - `Opensearch` [Dockerfile](docker-image/v1.16/arm64/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-arm64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-arm64-2` - `Loggly` [Dockerfile](docker-image/v1.16/arm64/debian-loggly/Dockerfile) - `Logentries` [Dockerfile](docker-image/v1.16/arm64/debian-logentries/Dockerfile) - `Cloudwatch` [Dockerfile](docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-arm64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-arm64-2` - `S3` [Dockerfile](docker-image/v1.16/arm64/debian-s3/Dockerfile) - `Syslog` [Dockerfile](docker-image/v1.16/arm64/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/arm64/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-arm64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-arm64-2` - `Gcs` [Dockerfile](docker-image/v1.16/arm64/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-arm64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-arm64-2` - `Graylog` [Dockerfile](docker-image/v1.16/arm64/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-arm64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-arm64-2` - `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.5-debian-kafka-arm64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-arm64-1.3` - `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.5-debian-kafka2-arm64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-arm64-1.3` - `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.5-debian-kinesis-arm64-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-arm64-2` diff --git a/docker-image/v1.16/arm64/debian-azureblob/Dockerfile b/docker-image/v1.16/arm64/debian-azureblob/Dockerfile index 5213bce68..832ab5388 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/Dockerfile +++ b/docker-image/v1.16/arm64/debian-azureblob/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push b/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push index 53b935f45..02644af67 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-azureblob/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.5-debian-azureblob-arm64-1.1,v1.16-debian-azureblob-arm64-2}; do +for tag in {v1.16.5-debian-azureblob-arm64-1.3,v1.16-debian-azureblob-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-cloudwatch/Dockerfile b/docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile index c64a81c04..eca319341 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile +++ b/docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock index bd5231424..2e20422ce 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.954.0) + aws-partitions (1.956.0) aws-sdk-cloudwatchlogs (1.87.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push index 54504c40d..d97d1fa2b 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-cloudwatch/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.5-debian-cloudwatch-arm64-1.1,v1.16-debian-cloudwatch-arm64-2}; do +for tag in {v1.16.5-debian-cloudwatch-arm64-1.3,v1.16-debian-cloudwatch-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-elasticsearch7/Dockerfile b/docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile index c64a81c04..eca319341 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push index 04205057f..0bf96d948 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/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.5-debian-elasticsearch7-arm64-1.1,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; do +for tag in {v1.16.5-debian-elasticsearch7-arm64-1.3,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; 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-elasticsearch8/Dockerfile b/docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile index c64a81c04..eca319341 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock index a955551f9..df696130b 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock @@ -7,7 +7,7 @@ GEM concurrent-ruby (1.3.3) cool.io (1.8.1) domain_name (0.6.20240107) - elastic-transport (8.3.2) + elastic-transport (8.3.5) faraday (< 3) multi_json elasticsearch (8.14.0) diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push index 104956c80..85eab760f 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/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.5-debian-elasticsearch8-arm64-1.1,v1.16-debian-elasticsearch8-arm64-2}; do +for tag in {v1.16.5-debian-elasticsearch8-arm64-1.3,v1.16-debian-elasticsearch8-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-forward/Dockerfile b/docker-image/v1.16/arm64/debian-forward/Dockerfile index c64a81c04..eca319341 100644 --- a/docker-image/v1.16/arm64/debian-forward/Dockerfile +++ b/docker-image/v1.16/arm64/debian-forward/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-forward/conf/fluent.conf b/docker-image/v1.16/arm64/debian-forward/conf/fluent.conf index 82825a17d..da980fc79 100644 --- a/docker-image/v1.16/arm64/debian-forward/conf/fluent.conf +++ b/docker-image/v1.16/arm64/debian-forward/conf/fluent.conf @@ -12,8 +12,8 @@ @id out_fwd @log_level info - host "#{ENV['FLUENT_FOWARD_HOST']}" - port "#{ENV['FLUENT_FOWARD_PORT']}" + host "#{ENV['FLUENT_FORWARD_HOST'] || ENV['FLUENT_FOWARD_HOST']}" + port "#{ENV['FLUENT_FORWARD_PORT'] || ENV['FLUENT_FOWARD_PORT']}" flush_interval "#{ENV['FLUENT_FORWARD_FLUSH_INTERVAL'] || use_default}" diff --git a/docker-image/v1.16/arm64/debian-forward/hooks/post_push b/docker-image/v1.16/arm64/debian-forward/hooks/post_push index c39fe371e..17ef5be0f 100644 --- a/docker-image/v1.16/arm64/debian-forward/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-forward/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.5-debian-forward-arm64-1.1,v1.16-debian-forward-arm64-2}; do +for tag in {v1.16.5-debian-forward-arm64-1.3,v1.16-debian-forward-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-gcs/Dockerfile b/docker-image/v1.16/arm64/debian-gcs/Dockerfile index c64a81c04..eca319341 100644 --- a/docker-image/v1.16/arm64/debian-gcs/Dockerfile +++ b/docker-image/v1.16/arm64/debian-gcs/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push b/docker-image/v1.16/arm64/debian-gcs/hooks/post_push index 3cec3633f..49b47de1a 100644 --- a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-gcs/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.5-debian-gcs-arm64-1.1,v1.16-debian-gcs-arm64-2}; do +for tag in {v1.16.5-debian-gcs-arm64-1.3,v1.16-debian-gcs-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-graylog/Dockerfile b/docker-image/v1.16/arm64/debian-graylog/Dockerfile index c3ec51f42..2067cfe62 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Dockerfile +++ b/docker-image/v1.16/arm64/debian-graylog/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push b/docker-image/v1.16/arm64/debian-graylog/hooks/post_push index 5e677ffc7..a5ef7c9b7 100644 --- a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-graylog/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.5-debian-graylog-arm64-1.2,v1.16-debian-graylog-arm64-2}; do +for tag in {v1.16.5-debian-graylog-arm64-1.3,v1.16-debian-graylog-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-kafka/Dockerfile b/docker-image/v1.16/arm64/debian-kafka/Dockerfile index 2b2857e70..4d3f9c450 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Dockerfile +++ b/docker-image/v1.16/arm64/debian-kafka/Dockerfile @@ -57,6 +57,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] 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 185b0ceda..0825b2162 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.5-debian-kafka-arm64-1.1,v1.16-debian-kafka-arm64-2}; do +for tag in {v1.16.5-debian-kafka-arm64-1.3,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 2b2857e70..4d3f9c450 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Dockerfile +++ b/docker-image/v1.16/arm64/debian-kafka2/Dockerfile @@ -57,6 +57,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] 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 58f6a9424..967314341 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.5-debian-kafka2-arm64-1.1,v1.16-debian-kafka2-arm64-2}; do +for tag in {v1.16.5-debian-kafka2-arm64-1.3,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/arm64/debian-kinesis/Dockerfile b/docker-image/v1.16/arm64/debian-kinesis/Dockerfile index c64a81c04..eca319341 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/Dockerfile +++ b/docker-image/v1.16/arm64/debian-kinesis/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock index de001e417..c671ad901 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.954.0) + aws-partitions (1.956.0) aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) diff --git a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push b/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push index 17f8b652d..9218681fd 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-kinesis/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.5-debian-kinesis-arm64-1.1,v1.16-debian-kinesis-arm64-2}; do +for tag in {v1.16.5-debian-kinesis-arm64-1.3,v1.16-debian-kinesis-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-logentries/Dockerfile b/docker-image/v1.16/arm64/debian-logentries/Dockerfile index c64a81c04..eca319341 100644 --- a/docker-image/v1.16/arm64/debian-logentries/Dockerfile +++ b/docker-image/v1.16/arm64/debian-logentries/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push b/docker-image/v1.16/arm64/debian-logentries/hooks/post_push index 5fb754e1e..d42f1767b 100644 --- a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logentries/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.5-debian-logentries-arm64-1.1,v1.16-debian-logentries-arm64-2}; do +for tag in {v1.16.5-debian-logentries-arm64-1.3,v1.16-debian-logentries-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-loggly/Dockerfile b/docker-image/v1.16/arm64/debian-loggly/Dockerfile index c64a81c04..eca319341 100644 --- a/docker-image/v1.16/arm64/debian-loggly/Dockerfile +++ b/docker-image/v1.16/arm64/debian-loggly/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push b/docker-image/v1.16/arm64/debian-loggly/hooks/post_push index abfe4a799..44e54148e 100644 --- a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-loggly/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.5-debian-loggly-arm64-1.1,v1.16-debian-loggly-arm64-2}; do +for tag in {v1.16.5-debian-loggly-arm64-1.3,v1.16-debian-loggly-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-logzio/Dockerfile b/docker-image/v1.16/arm64/debian-logzio/Dockerfile index c64a81c04..eca319341 100644 --- a/docker-image/v1.16/arm64/debian-logzio/Dockerfile +++ b/docker-image/v1.16/arm64/debian-logzio/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push b/docker-image/v1.16/arm64/debian-logzio/hooks/post_push index b5c86cddf..231db38e9 100644 --- a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logzio/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.5-debian-logzio-arm64-1.1,v1.16-debian-logzio-arm64-2}; do +for tag in {v1.16.5-debian-logzio-arm64-1.3,v1.16-debian-logzio-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-opensearch/Dockerfile b/docker-image/v1.16/arm64/debian-opensearch/Dockerfile index c64a81c04..eca319341 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/Dockerfile +++ b/docker-image/v1.16/arm64/debian-opensearch/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock index 6ae71d2ab..0151d9afc 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.954.0) + aws-partitions (1.956.0) aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -115,7 +115,7 @@ GEM uri netrc (0.11.0) oj (3.15.1) - opensearch-ruby (3.3.0) + opensearch-ruby (3.4.0) faraday (>= 1.0, < 3) multi_json (>= 1.0) prometheus-client (4.2.3) diff --git a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push b/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push index 1fa000d67..cb87d2c1b 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-opensearch/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.5-debian-opensearch-arm64-1.1,v1.16-debian-opensearch-arm64-2}; do +for tag in {v1.16.5-debian-opensearch-arm64-1.3,v1.16-debian-opensearch-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-papertrail/Dockerfile b/docker-image/v1.16/arm64/debian-papertrail/Dockerfile index c64a81c04..eca319341 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/Dockerfile +++ b/docker-image/v1.16/arm64/debian-papertrail/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push b/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push index 11cd13ecf..be9bcd169 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-papertrail/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.5-debian-papertrail-arm64-1.1,v1.16-debian-papertrail-arm64-2}; do +for tag in {v1.16.5-debian-papertrail-arm64-1.3,v1.16-debian-papertrail-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-s3/Dockerfile b/docker-image/v1.16/arm64/debian-s3/Dockerfile index 3bf2a9d18..b6e2ed13f 100644 --- a/docker-image/v1.16/arm64/debian-s3/Dockerfile +++ b/docker-image/v1.16/arm64/debian-s3/Dockerfile @@ -59,6 +59,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-s3/Gemfile.lock b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock index 3b8857551..01f52b500 100644 --- a/docker-image/v1.16/arm64/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.954.0) + aws-partitions (1.956.0) aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) diff --git a/docker-image/v1.16/arm64/debian-s3/hooks/post_push b/docker-image/v1.16/arm64/debian-s3/hooks/post_push index 0308eaab0..09c880b60 100644 --- a/docker-image/v1.16/arm64/debian-s3/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-s3/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.5-debian-s3-arm64-1.1,v1.16-debian-s3-arm64-2}; do +for tag in {v1.16.5-debian-s3-arm64-1.3,v1.16-debian-s3-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-syslog/Dockerfile b/docker-image/v1.16/arm64/debian-syslog/Dockerfile index c64a81c04..eca319341 100644 --- a/docker-image/v1.16/arm64/debian-syslog/Dockerfile +++ b/docker-image/v1.16/arm64/debian-syslog/Dockerfile @@ -55,6 +55,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push b/docker-image/v1.16/arm64/debian-syslog/hooks/post_push index b3e72cf78..d0349d268 100644 --- a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-syslog/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.5-debian-syslog-arm64-1.1,v1.16-debian-syslog-arm64-2}; do +for tag in {v1.16.5-debian-syslog-arm64-1.3,v1.16-debian-syslog-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-azureblob/Dockerfile b/docker-image/v1.16/debian-azureblob/Dockerfile index e1c0ba2de..cb45afb22 100644 --- a/docker-image/v1.16/debian-azureblob/Dockerfile +++ b/docker-image/v1.16/debian-azureblob/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-azureblob/hooks/post_push b/docker-image/v1.16/debian-azureblob/hooks/post_push index dd7cb6d61..077eab031 100644 --- a/docker-image/v1.16/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/debian-azureblob/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.5-debian-azureblob-amd64-1.1,v1.16-debian-azureblob-amd64-2}; do +for tag in {v1.16.5-debian-azureblob-amd64-1.3,v1.16-debian-azureblob-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-cloudwatch/Dockerfile b/docker-image/v1.16/debian-cloudwatch/Dockerfile index 4c234c114..8fbb6325b 100644 --- a/docker-image/v1.16/debian-cloudwatch/Dockerfile +++ b/docker-image/v1.16/debian-cloudwatch/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-cloudwatch/Gemfile.lock b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock index bd5231424..2e20422ce 100644 --- a/docker-image/v1.16/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.954.0) + aws-partitions (1.956.0) aws-sdk-cloudwatchlogs (1.87.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) diff --git a/docker-image/v1.16/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/debian-cloudwatch/hooks/post_push index 2a4b685e7..92a1990d1 100644 --- a/docker-image/v1.16/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/debian-cloudwatch/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.5-debian-cloudwatch-amd64-1.1,v1.16-debian-cloudwatch-amd64-2}; do +for tag in {v1.16.5-debian-cloudwatch-amd64-1.3,v1.16-debian-cloudwatch-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-elasticsearch7/Dockerfile b/docker-image/v1.16/debian-elasticsearch7/Dockerfile index 4c234c114..8fbb6325b 100644 --- a/docker-image/v1.16/debian-elasticsearch7/Dockerfile +++ b/docker-image/v1.16/debian-elasticsearch7/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/debian-elasticsearch7/hooks/post_push index 14f60baef..a0112b0fc 100644 --- a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch7/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.5-debian-elasticsearch7-amd64-1.1,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; do +for tag in {v1.16.5-debian-elasticsearch7-amd64-1.3,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; 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-elasticsearch8/Dockerfile b/docker-image/v1.16/debian-elasticsearch8/Dockerfile index 4c234c114..8fbb6325b 100644 --- a/docker-image/v1.16/debian-elasticsearch8/Dockerfile +++ b/docker-image/v1.16/debian-elasticsearch8/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock index a955551f9..df696130b 100644 --- a/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock @@ -7,7 +7,7 @@ GEM concurrent-ruby (1.3.3) cool.io (1.8.1) domain_name (0.6.20240107) - elastic-transport (8.3.2) + elastic-transport (8.3.5) faraday (< 3) multi_json elasticsearch (8.14.0) diff --git a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/debian-elasticsearch8/hooks/post_push index 844756527..4d4ec0d10 100644 --- a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch8/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.5-debian-elasticsearch8-amd64-1.1,v1.16-debian-elasticsearch8-amd64-2}; do +for tag in {v1.16.5-debian-elasticsearch8-amd64-1.3,v1.16-debian-elasticsearch8-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-forward/Dockerfile b/docker-image/v1.16/debian-forward/Dockerfile index 4c234c114..8fbb6325b 100644 --- a/docker-image/v1.16/debian-forward/Dockerfile +++ b/docker-image/v1.16/debian-forward/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-forward/conf/fluent.conf b/docker-image/v1.16/debian-forward/conf/fluent.conf index 82825a17d..da980fc79 100644 --- a/docker-image/v1.16/debian-forward/conf/fluent.conf +++ b/docker-image/v1.16/debian-forward/conf/fluent.conf @@ -12,8 +12,8 @@ @id out_fwd @log_level info - host "#{ENV['FLUENT_FOWARD_HOST']}" - port "#{ENV['FLUENT_FOWARD_PORT']}" + host "#{ENV['FLUENT_FORWARD_HOST'] || ENV['FLUENT_FOWARD_HOST']}" + port "#{ENV['FLUENT_FORWARD_PORT'] || ENV['FLUENT_FOWARD_PORT']}" flush_interval "#{ENV['FLUENT_FORWARD_FLUSH_INTERVAL'] || use_default}" diff --git a/docker-image/v1.16/debian-forward/hooks/post_push b/docker-image/v1.16/debian-forward/hooks/post_push index 67fd5ae48..0773f4275 100644 --- a/docker-image/v1.16/debian-forward/hooks/post_push +++ b/docker-image/v1.16/debian-forward/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.5-debian-forward-amd64-1.1,v1.16-debian-forward-amd64-2}; do +for tag in {v1.16.5-debian-forward-amd64-1.3,v1.16-debian-forward-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-gcs/Dockerfile b/docker-image/v1.16/debian-gcs/Dockerfile index 4c234c114..8fbb6325b 100644 --- a/docker-image/v1.16/debian-gcs/Dockerfile +++ b/docker-image/v1.16/debian-gcs/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-gcs/hooks/post_push b/docker-image/v1.16/debian-gcs/hooks/post_push index 04e174e7a..d64409f75 100644 --- a/docker-image/v1.16/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/debian-gcs/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.5-debian-gcs-amd64-1.1,v1.16-debian-gcs-amd64-2}; do +for tag in {v1.16.5-debian-gcs-amd64-1.3,v1.16-debian-gcs-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-graylog/Dockerfile b/docker-image/v1.16/debian-graylog/Dockerfile index 9c19f87bd..5fcb457b6 100644 --- a/docker-image/v1.16/debian-graylog/Dockerfile +++ b/docker-image/v1.16/debian-graylog/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-graylog/hooks/post_push b/docker-image/v1.16/debian-graylog/hooks/post_push index 0e85a6899..bf2e82859 100644 --- a/docker-image/v1.16/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/debian-graylog/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.5-debian-graylog-amd64-1.2,v1.16-debian-graylog-amd64-2}; do +for tag in {v1.16.5-debian-graylog-amd64-1.3,v1.16-debian-graylog-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-kafka/Dockerfile b/docker-image/v1.16/debian-kafka/Dockerfile index 5101a0a62..2b40f7fee 100644 --- a/docker-image/v1.16/debian-kafka/Dockerfile +++ b/docker-image/v1.16/debian-kafka/Dockerfile @@ -49,6 +49,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-kafka/hooks/post_push b/docker-image/v1.16/debian-kafka/hooks/post_push index 2889a7fd8..47fa80c2f 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.5-debian-kafka-amd64-1.1,v1.16-debian-kafka-amd64-2}; do +for tag in {v1.16.5-debian-kafka-amd64-1.3,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 5101a0a62..2b40f7fee 100644 --- a/docker-image/v1.16/debian-kafka2/Dockerfile +++ b/docker-image/v1.16/debian-kafka2/Dockerfile @@ -49,6 +49,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-kafka2/hooks/post_push b/docker-image/v1.16/debian-kafka2/hooks/post_push index 0588e13ed..1daaa4e9b 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.5-debian-kafka2-amd64-1.1,v1.16-debian-kafka2-amd64-2}; do +for tag in {v1.16.5-debian-kafka2-amd64-1.3,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 diff --git a/docker-image/v1.16/debian-kinesis/Dockerfile b/docker-image/v1.16/debian-kinesis/Dockerfile index 4c234c114..8fbb6325b 100644 --- a/docker-image/v1.16/debian-kinesis/Dockerfile +++ b/docker-image/v1.16/debian-kinesis/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-kinesis/Gemfile.lock b/docker-image/v1.16/debian-kinesis/Gemfile.lock index de001e417..c671ad901 100644 --- a/docker-image/v1.16/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/debian-kinesis/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.954.0) + aws-partitions (1.956.0) aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) diff --git a/docker-image/v1.16/debian-kinesis/hooks/post_push b/docker-image/v1.16/debian-kinesis/hooks/post_push index af80086cf..ef24c5ef7 100644 --- a/docker-image/v1.16/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/debian-kinesis/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.5-debian-kinesis-amd64-1.1,v1.16-debian-kinesis-amd64-2}; do +for tag in {v1.16.5-debian-kinesis-amd64-1.3,v1.16-debian-kinesis-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-logentries/Dockerfile b/docker-image/v1.16/debian-logentries/Dockerfile index 4c234c114..8fbb6325b 100644 --- a/docker-image/v1.16/debian-logentries/Dockerfile +++ b/docker-image/v1.16/debian-logentries/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-logentries/hooks/post_push b/docker-image/v1.16/debian-logentries/hooks/post_push index aa011cedb..eb13b3ef3 100644 --- a/docker-image/v1.16/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/debian-logentries/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.5-debian-logentries-amd64-1.1,v1.16-debian-logentries-amd64-2}; do +for tag in {v1.16.5-debian-logentries-amd64-1.3,v1.16-debian-logentries-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-loggly/Dockerfile b/docker-image/v1.16/debian-loggly/Dockerfile index 4c234c114..8fbb6325b 100644 --- a/docker-image/v1.16/debian-loggly/Dockerfile +++ b/docker-image/v1.16/debian-loggly/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-loggly/hooks/post_push b/docker-image/v1.16/debian-loggly/hooks/post_push index c3a23d016..3936b7317 100644 --- a/docker-image/v1.16/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/debian-loggly/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.5-debian-loggly-amd64-1.1,v1.16-debian-loggly-amd64-2}; do +for tag in {v1.16.5-debian-loggly-amd64-1.3,v1.16-debian-loggly-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-logzio/Dockerfile b/docker-image/v1.16/debian-logzio/Dockerfile index 4c234c114..8fbb6325b 100644 --- a/docker-image/v1.16/debian-logzio/Dockerfile +++ b/docker-image/v1.16/debian-logzio/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-logzio/hooks/post_push b/docker-image/v1.16/debian-logzio/hooks/post_push index 6e9eeb439..1bc775825 100644 --- a/docker-image/v1.16/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/debian-logzio/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.5-debian-logzio-amd64-1.1,v1.16-debian-logzio-amd64-2}; do +for tag in {v1.16.5-debian-logzio-amd64-1.3,v1.16-debian-logzio-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-opensearch/Dockerfile b/docker-image/v1.16/debian-opensearch/Dockerfile index 4c234c114..8fbb6325b 100644 --- a/docker-image/v1.16/debian-opensearch/Dockerfile +++ b/docker-image/v1.16/debian-opensearch/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-opensearch/Gemfile.lock b/docker-image/v1.16/debian-opensearch/Gemfile.lock index 6ae71d2ab..0151d9afc 100644 --- a/docker-image/v1.16/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/debian-opensearch/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.954.0) + aws-partitions (1.956.0) aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -115,7 +115,7 @@ GEM uri netrc (0.11.0) oj (3.15.1) - opensearch-ruby (3.3.0) + opensearch-ruby (3.4.0) faraday (>= 1.0, < 3) multi_json (>= 1.0) prometheus-client (4.2.3) diff --git a/docker-image/v1.16/debian-opensearch/hooks/post_push b/docker-image/v1.16/debian-opensearch/hooks/post_push index d640ca7fc..5ee6cb7ce 100644 --- a/docker-image/v1.16/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/debian-opensearch/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.5-debian-opensearch-amd64-1.1,v1.16-debian-opensearch-amd64-2}; do +for tag in {v1.16.5-debian-opensearch-amd64-1.3,v1.16-debian-opensearch-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-papertrail/Dockerfile b/docker-image/v1.16/debian-papertrail/Dockerfile index 4c234c114..8fbb6325b 100644 --- a/docker-image/v1.16/debian-papertrail/Dockerfile +++ b/docker-image/v1.16/debian-papertrail/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-papertrail/hooks/post_push b/docker-image/v1.16/debian-papertrail/hooks/post_push index 69cf558f7..880dff1f3 100644 --- a/docker-image/v1.16/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/debian-papertrail/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.5-debian-papertrail-amd64-1.1,v1.16-debian-papertrail-amd64-2}; do +for tag in {v1.16.5-debian-papertrail-amd64-1.3,v1.16-debian-papertrail-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-s3/Dockerfile b/docker-image/v1.16/debian-s3/Dockerfile index de0deb6f0..57ea9f64e 100644 --- a/docker-image/v1.16/debian-s3/Dockerfile +++ b/docker-image/v1.16/debian-s3/Dockerfile @@ -51,6 +51,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-s3/Gemfile.lock b/docker-image/v1.16/debian-s3/Gemfile.lock index 3b8857551..01f52b500 100644 --- a/docker-image/v1.16/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/debian-s3/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.954.0) + aws-partitions (1.956.0) aws-sdk-core (3.201.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) diff --git a/docker-image/v1.16/debian-s3/hooks/post_push b/docker-image/v1.16/debian-s3/hooks/post_push index 55e728baa..722d539b0 100644 --- a/docker-image/v1.16/debian-s3/hooks/post_push +++ b/docker-image/v1.16/debian-s3/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.5-debian-s3-amd64-1.1,v1.16-debian-s3-amd64-2}; do +for tag in {v1.16.5-debian-s3-amd64-1.3,v1.16-debian-s3-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-syslog/Dockerfile b/docker-image/v1.16/debian-syslog/Dockerfile index 4c234c114..8fbb6325b 100644 --- a/docker-image/v1.16/debian-syslog/Dockerfile +++ b/docker-image/v1.16/debian-syslog/Dockerfile @@ -47,6 +47,9 @@ COPY entrypoint.sh /fluentd/entrypoint.sh # Environment variables ENV FLUENTD_OPT="" ENV FLUENTD_CONF="fluent.conf" +# Override LD_PRELOAD in fluentd docker image +# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly +ENV LD_PRELOAD="" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"] diff --git a/docker-image/v1.16/debian-syslog/hooks/post_push b/docker-image/v1.16/debian-syslog/hooks/post_push index b64d69885..c76f808f3 100644 --- a/docker-image/v1.16/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/debian-syslog/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.5-debian-syslog-amd64-1.1,v1.16-debian-syslog-amd64-2}; do +for tag in {v1.16.5-debian-syslog-amd64-1.3,v1.16-debian-syslog-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 From dd8a2cb1cd17aac85ddfa983bf671b50216b5a8e Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 14 Aug 2024 10:27:30 +0900 Subject: [PATCH 15/26] Backport: fix missing OpenSSL dependency (PR#1521) (#1522) * Backport: fix missing OpenSSL dependency (PR#1521) Closes: #1520 Adding the libssl-dev library in build dependencies allows the usage of SSL attributes in rdkafka2 configuration. Signed-off-by: Kentaro Hayashi * Bump up bundled version for kafka Signed-off-by: Kentaro Hayashi * Add v1.16.5-1.4 images Signed-off-by: Kentaro Hayashi --------- Signed-off-by: Kentaro Hayashi --- Makefile | 68 ++++++++--------- README.md | 74 +++++++++---------- .../v1.16/arm64/debian-azureblob/Gemfile.lock | 12 +-- .../arm64/debian-azureblob/hooks/post_push | 2 +- .../arm64/debian-cloudwatch/Gemfile.lock | 14 ++-- .../arm64/debian-cloudwatch/hooks/post_push | 2 +- .../arm64/debian-elasticsearch7/Gemfile.lock | 8 +- .../debian-elasticsearch7/hooks/post_push | 2 +- .../arm64/debian-elasticsearch8/Gemfile.lock | 16 ++-- .../debian-elasticsearch8/hooks/post_push | 2 +- .../v1.16/arm64/debian-forward/Gemfile.lock | 6 +- .../arm64/debian-forward/hooks/post_push | 2 +- .../v1.16/arm64/debian-gcs/Gemfile.lock | 21 +++--- .../v1.16/arm64/debian-gcs/hooks/post_push | 2 +- .../v1.16/arm64/debian-graylog/Gemfile.lock | 6 +- .../arm64/debian-graylog/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka/Dockerfile | 2 +- docker-image/v1.16/arm64/debian-kafka/Gemfile | 6 +- .../v1.16/arm64/debian-kafka/Gemfile.lock | 20 ++--- .../v1.16/arm64/debian-kafka/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka2/Dockerfile | 2 +- .../v1.16/arm64/debian-kafka2/Gemfile | 6 +- .../v1.16/arm64/debian-kafka2/Gemfile.lock | 20 ++--- .../v1.16/arm64/debian-kafka2/hooks/post_push | 2 +- .../v1.16/arm64/debian-kinesis/Gemfile.lock | 18 ++--- .../arm64/debian-kinesis/hooks/post_push | 2 +- .../arm64/debian-logentries/Gemfile.lock | 6 +- .../arm64/debian-logentries/hooks/post_push | 2 +- .../v1.16/arm64/debian-loggly/Gemfile.lock | 6 +- .../v1.16/arm64/debian-loggly/hooks/post_push | 2 +- .../v1.16/arm64/debian-logzio/Gemfile.lock | 6 +- .../v1.16/arm64/debian-logzio/hooks/post_push | 2 +- .../arm64/debian-opensearch/Gemfile.lock | 16 ++-- .../arm64/debian-opensearch/hooks/post_push | 2 +- .../arm64/debian-papertrail/Gemfile.lock | 6 +- .../arm64/debian-papertrail/hooks/post_push | 2 +- .../v1.16/arm64/debian-s3/Gemfile.lock | 14 ++-- .../v1.16/arm64/debian-s3/hooks/post_push | 2 +- .../v1.16/arm64/debian-syslog/Gemfile.lock | 6 +- .../v1.16/arm64/debian-syslog/hooks/post_push | 2 +- .../v1.16/debian-azureblob/Gemfile.lock | 12 +-- .../v1.16/debian-azureblob/hooks/post_push | 2 +- .../v1.16/debian-cloudwatch/Gemfile.lock | 14 ++-- .../v1.16/debian-cloudwatch/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch7/Gemfile.lock | 8 +- .../debian-elasticsearch7/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch8/Gemfile.lock | 16 ++-- .../debian-elasticsearch8/hooks/post_push | 2 +- .../v1.16/debian-forward/Gemfile.lock | 6 +- .../v1.16/debian-forward/hooks/post_push | 2 +- docker-image/v1.16/debian-gcs/Gemfile.lock | 21 +++--- docker-image/v1.16/debian-gcs/hooks/post_push | 2 +- .../v1.16/debian-graylog/Gemfile.lock | 6 +- .../v1.16/debian-graylog/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka/Dockerfile | 2 +- docker-image/v1.16/debian-kafka/Gemfile | 6 +- docker-image/v1.16/debian-kafka/Gemfile.lock | 20 ++--- .../v1.16/debian-kafka/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka2/Dockerfile | 2 +- docker-image/v1.16/debian-kafka2/Gemfile | 6 +- docker-image/v1.16/debian-kafka2/Gemfile.lock | 20 ++--- .../v1.16/debian-kafka2/hooks/post_push | 2 +- .../v1.16/debian-kinesis/Gemfile.lock | 18 ++--- .../v1.16/debian-kinesis/hooks/post_push | 2 +- .../v1.16/debian-logentries/Gemfile.lock | 6 +- .../v1.16/debian-logentries/hooks/post_push | 2 +- docker-image/v1.16/debian-loggly/Gemfile.lock | 6 +- .../v1.16/debian-loggly/hooks/post_push | 2 +- docker-image/v1.16/debian-logzio/Gemfile.lock | 6 +- .../v1.16/debian-logzio/hooks/post_push | 2 +- .../v1.16/debian-opensearch/Gemfile.lock | 16 ++-- .../v1.16/debian-opensearch/hooks/post_push | 2 +- .../v1.16/debian-papertrail/Gemfile.lock | 6 +- .../v1.16/debian-papertrail/hooks/post_push | 2 +- docker-image/v1.16/debian-s3/Gemfile.lock | 14 ++-- docker-image/v1.16/debian-s3/hooks/post_push | 2 +- docker-image/v1.16/debian-syslog/Gemfile.lock | 6 +- .../v1.16/debian-syslog/hooks/post_push | 2 +- templates/Dockerfile.erb | 2 +- templates/Gemfile.erb | 6 +- 80 files changed, 327 insertions(+), 325 deletions(-) diff --git a/Makefile b/Makefile index 04d1ad988..8c3a640ef 100644 --- a/Makefile +++ b/Makefile @@ -12,44 +12,44 @@ IMAGE_NAME := fluent/fluentd-kubernetes X86_IMAGES := \ - v1.16/debian-azureblob:v1.16.5-debian-azureblob-amd64-1.3,v1.16-debian-azureblob-amd64-2 \ - v1.16/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-amd64-1.3,v1.16-debian-elasticsearch8-amd64-2 \ - v1.16/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-amd64-1.3,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ - v1.16/debian-opensearch:v1.16.5-debian-opensearch-amd64-1.3,v1.16-debian-opensearch-amd64-2 \ - v1.16/debian-loggly:v1.16.5-debian-loggly-amd64-1.3,v1.16-debian-loggly-amd64-2 \ - v1.16/debian-logentries:v1.16.5-debian-logentries-amd64-1.3,v1.16-debian-logentries-amd64-2 \ - v1.16/debian-cloudwatch:v1.16.5-debian-cloudwatch-amd64-1.3,v1.16-debian-cloudwatch-amd64-2 \ - v1.16/debian-s3:v1.16.5-debian-s3-amd64-1.3,v1.16-debian-s3-amd64-2 \ - v1.16/debian-syslog:v1.16.5-debian-syslog-amd64-1.3,v1.16-debian-syslog-amd64-2 \ - v1.16/debian-forward:v1.16.5-debian-forward-amd64-1.3,v1.16-debian-forward-amd64-2 \ - v1.16/debian-gcs:v1.16.5-debian-gcs-amd64-1.3,v1.16-debian-gcs-amd64-2 \ - v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.3,v1.16-debian-graylog-amd64-2 \ - v1.16/debian-papertrail:v1.16.5-debian-papertrail-amd64-1.3,v1.16-debian-papertrail-amd64-2 \ - v1.16/debian-logzio:v1.16.5-debian-logzio-amd64-1.3,v1.16-debian-logzio-amd64-2 \ - v1.16/debian-kafka:v1.16.5-debian-kafka-amd64-1.3,v1.16-debian-kafka-amd64-2 \ - v1.16/debian-kafka2:v1.16.5-debian-kafka2-amd64-1.3,v1.16-debian-kafka2-amd64-2 \ - v1.16/debian-kinesis:v1.16.5-debian-kinesis-amd64-1.3,v1.16-debian-kinesis-amd64-2 + v1.16/debian-azureblob:v1.16.5-debian-azureblob-amd64-1.4,v1.16-debian-azureblob-amd64-2 \ + v1.16/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-amd64-1.4,v1.16-debian-elasticsearch8-amd64-2 \ + v1.16/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-amd64-1.4,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ + v1.16/debian-opensearch:v1.16.5-debian-opensearch-amd64-1.4,v1.16-debian-opensearch-amd64-2 \ + v1.16/debian-loggly:v1.16.5-debian-loggly-amd64-1.4,v1.16-debian-loggly-amd64-2 \ + v1.16/debian-logentries:v1.16.5-debian-logentries-amd64-1.4,v1.16-debian-logentries-amd64-2 \ + v1.16/debian-cloudwatch:v1.16.5-debian-cloudwatch-amd64-1.4,v1.16-debian-cloudwatch-amd64-2 \ + v1.16/debian-s3:v1.16.5-debian-s3-amd64-1.4,v1.16-debian-s3-amd64-2 \ + v1.16/debian-syslog:v1.16.5-debian-syslog-amd64-1.4,v1.16-debian-syslog-amd64-2 \ + v1.16/debian-forward:v1.16.5-debian-forward-amd64-1.4,v1.16-debian-forward-amd64-2 \ + v1.16/debian-gcs:v1.16.5-debian-gcs-amd64-1.4,v1.16-debian-gcs-amd64-2 \ + v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.4,v1.16-debian-graylog-amd64-2 \ + v1.16/debian-papertrail:v1.16.5-debian-papertrail-amd64-1.4,v1.16-debian-papertrail-amd64-2 \ + v1.16/debian-logzio:v1.16.5-debian-logzio-amd64-1.4,v1.16-debian-logzio-amd64-2 \ + v1.16/debian-kafka:v1.16.5-debian-kafka-amd64-1.4,v1.16-debian-kafka-amd64-2 \ + v1.16/debian-kafka2:v1.16.5-debian-kafka2-amd64-1.4,v1.16-debian-kafka2-amd64-2 \ + v1.16/debian-kinesis:v1.16.5-debian-kinesis-amd64-1.4,v1.16-debian-kinesis-amd64-2 # :,,,... ARM64_IMAGES := \ - v1.16/arm64/debian-azureblob:v1.16.5-debian-azureblob-arm64-1.3,v1.16-debian-azureblob-arm64-2 \ - v1.16/arm64/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-arm64-1.3,v1.16-debian-elasticsearch8-arm64-2 \ - v1.16/arm64/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-arm64-1.3,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ - v1.16/arm64/debian-opensearch:v1.16.5-debian-opensearch-arm64-1.3,v1.16-debian-opensearch-arm64-2 \ - v1.16/arm64/debian-loggly:v1.16.5-debian-loggly-arm64-1.3,v1.16-debian-loggly-arm64-2 \ - v1.16/arm64/debian-logentries:v1.16.5-debian-logentries-arm64-1.3,v1.16-debian-logentries-arm64-2 \ - v1.16/arm64/debian-cloudwatch:v1.16.5-debian-cloudwatch-arm64-1.3,v1.16-debian-cloudwatch-arm64-2 \ - v1.16/arm64/debian-s3:v1.16.5-debian-s3-arm64-1.3,v1.16-debian-s3-arm64-2 \ - v1.16/arm64/debian-syslog:v1.16.5-debian-syslog-arm64-1.3,v1.16-debian-syslog-arm64-2 \ - v1.16/arm64/debian-forward:v1.16.5-debian-forward-arm64-1.3,v1.16-debian-forward-arm64-2 \ - v1.16/arm64/debian-gcs:v1.16.5-debian-gcs-arm64-1.3,v1.16-debian-gcs-arm64-2 \ - v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.3,v1.16-debian-graylog-arm64-2 \ - v1.16/arm64/debian-papertrail:v1.16.5-debian-papertrail-arm64-1.3,v1.16-debian-papertrail-arm64-2 \ - v1.16/arm64/debian-logzio:v1.16.5-debian-logzio-arm64-1.3,v1.16-debian-logzio-arm64-2 \ - v1.16/arm64/debian-kafka:v1.16.5-debian-kafka-arm64-1.3,v1.16-debian-kafka-arm64-2 \ - v1.16/arm64/debian-kafka2:v1.16.5-debian-kafka2-arm64-1.3,v1.16-debian-kafka2-arm64-2 \ - v1.16/arm64/debian-kinesis:v1.16.5-debian-kinesis-arm64-1.3,v1.16-debian-kinesis-arm64-2 + v1.16/arm64/debian-azureblob:v1.16.5-debian-azureblob-arm64-1.4,v1.16-debian-azureblob-arm64-2 \ + v1.16/arm64/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-arm64-1.4,v1.16-debian-elasticsearch8-arm64-2 \ + v1.16/arm64/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-arm64-1.4,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ + v1.16/arm64/debian-opensearch:v1.16.5-debian-opensearch-arm64-1.4,v1.16-debian-opensearch-arm64-2 \ + v1.16/arm64/debian-loggly:v1.16.5-debian-loggly-arm64-1.4,v1.16-debian-loggly-arm64-2 \ + v1.16/arm64/debian-logentries:v1.16.5-debian-logentries-arm64-1.4,v1.16-debian-logentries-arm64-2 \ + v1.16/arm64/debian-cloudwatch:v1.16.5-debian-cloudwatch-arm64-1.4,v1.16-debian-cloudwatch-arm64-2 \ + v1.16/arm64/debian-s3:v1.16.5-debian-s3-arm64-1.4,v1.16-debian-s3-arm64-2 \ + v1.16/arm64/debian-syslog:v1.16.5-debian-syslog-arm64-1.4,v1.16-debian-syslog-arm64-2 \ + v1.16/arm64/debian-forward:v1.16.5-debian-forward-arm64-1.4,v1.16-debian-forward-arm64-2 \ + v1.16/arm64/debian-gcs:v1.16.5-debian-gcs-arm64-1.4,v1.16-debian-gcs-arm64-2 \ + v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.4,v1.16-debian-graylog-arm64-2 \ + v1.16/arm64/debian-papertrail:v1.16.5-debian-papertrail-arm64-1.4,v1.16-debian-papertrail-arm64-2 \ + v1.16/arm64/debian-logzio:v1.16.5-debian-logzio-arm64-1.4,v1.16-debian-logzio-arm64-2 \ + v1.16/arm64/debian-kafka:v1.16.5-debian-kafka-arm64-1.4,v1.16-debian-kafka-arm64-2 \ + v1.16/arm64/debian-kafka2:v1.16.5-debian-kafka2-arm64-1.4,v1.16-debian-kafka2-arm64-2 \ + v1.16/arm64/debian-kinesis:v1.16.5-debian-kinesis-arm64-1.4,v1.16-debian-kinesis-arm64-2 ALL_IMAGES := $(X86_IMAGES) $(ARM64_IMAGES) diff --git a/README.md b/README.md index 16e9a522f..5da5698e2 100644 --- a/README.md +++ b/README.md @@ -25,130 +25,130 @@ If you want to use above non published images, build it by yourself. Dockerfile ##### Multi-Arch images - `Azureblob` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-2` - `Elasticsearch8` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-2` - `Elasticsearch7` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch` - `Opensearch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-2` - `Cloudwatch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-2` - `Forward` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-2` - `Gcs` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-2` - `Graylog` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-2` - `Kafka` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-2` - `Kafka2` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-2` - `Kinesis` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-2` ##### x86_64 images - `Azureblob` [Dockerfile](docker-image/v1.16/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-amd64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-amd64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-amd64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-amd64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-amd64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-amd64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-amd64` - `Opensearch` [Dockerfile](docker-image/v1.16/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-amd64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-amd64-2` - `Loggly` [Dockerfile](docker-image/v1.16/debian-loggly/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-loggly-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-loggly-amd64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-loggly-amd64-2` - `Logentries` [Dockerfile](docker-image/v1.16/debian-logentries/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logentries-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logentries-amd64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-logentries-amd64-2` - `Cloudwatch` [Dockerfile](docker-image/v1.16/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-amd64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-amd64-2` - `S3` [Dockerfile](docker-image/v1.16/debian-s3/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-s3-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-s3-amd64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-s3-amd64-2` - `Syslog` [Dockerfile](docker-image/v1.16/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-amd64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-amd64-2` - `Gcs` [Dockerfile](docker-image/v1.16/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-amd64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-amd64-2` - `Graylog` [Dockerfile](docker-image/v1.16/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-amd64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-amd64-2` - `Papertrail` [Dockerfile](docker-image/v1.16/debian-papertrail/Dockerfile) - `Logzio` [Dockerfile](docker-image/v1.16/debian-logzio/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logzio-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logzio-amd64-1.4` - `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.5-debian-kafka-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-amd64-1.4` - `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.5-debian-kafka2-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-amd64-1.4` - `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.5-debian-kinesis-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-amd64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-amd64-2` ##### arm64 images - `Azureblob` [Dockerfile](docker-image/v1.16/arm64/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-arm64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-arm64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-arm64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-arm64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-arm64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-arm64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-arm64` - `Opensearch` [Dockerfile](docker-image/v1.16/arm64/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-arm64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-arm64-2` - `Loggly` [Dockerfile](docker-image/v1.16/arm64/debian-loggly/Dockerfile) - `Logentries` [Dockerfile](docker-image/v1.16/arm64/debian-logentries/Dockerfile) - `Cloudwatch` [Dockerfile](docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-arm64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-arm64-2` - `S3` [Dockerfile](docker-image/v1.16/arm64/debian-s3/Dockerfile) - `Syslog` [Dockerfile](docker-image/v1.16/arm64/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/arm64/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-arm64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-arm64-2` - `Gcs` [Dockerfile](docker-image/v1.16/arm64/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-arm64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-arm64-2` - `Graylog` [Dockerfile](docker-image/v1.16/arm64/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-arm64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-arm64-2` - `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.5-debian-kafka-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-arm64-1.4` - `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.5-debian-kafka2-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-arm64-1.4` - `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.5-debian-kinesis-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-arm64-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-arm64-2` diff --git a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock index 9b66c4568..51c2c9f78 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock @@ -12,7 +12,7 @@ GEM net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cool.io (1.8.1) domain_name (0.6.20240107) @@ -34,7 +34,7 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) @@ -114,7 +114,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -122,14 +122,14 @@ GEM net-http-persistent (4.0.2) connection_pool (~> 2.2) netrc (0.11.0) - nokogiri (1.16.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) - racc (1.8.0) + public_suffix (6.0.1) + racc (1.8.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push b/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push index 02644af67..ae37ae266 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-azureblob/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.5-debian-azureblob-arm64-1.3,v1.16-debian-azureblob-arm64-2}; do +for tag in {v1.16.5-debian-azureblob-arm64-1.4,v1.16-debian-azureblob-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-cloudwatch/Gemfile.lock b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock index 2e20422ce..e9252ec04 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock @@ -4,19 +4,19 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-cloudwatchlogs (1.87.0) + aws-partitions (1.963.0) + aws-sdk-cloudwatchlogs (1.88.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.201.1) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -93,14 +93,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push index d97d1fa2b..4fe8039b7 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-cloudwatch/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.5-debian-cloudwatch-arm64-1.3,v1.16-debian-cloudwatch-arm64-2}; do +for tag in {v1.16.5-debian-cloudwatch-arm64-1.4,v1.16-debian-cloudwatch-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-elasticsearch7/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock index 45c1cc4eb..8b3dca5b9 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) elasticsearch (7.17.11) @@ -37,7 +37,7 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) @@ -119,7 +119,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) multipart-post (2.4.1) @@ -127,7 +127,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push index 0bf96d948..373597e3d 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/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.5-debian-elasticsearch7-arm64-1.3,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; do +for tag in {v1.16.5-debian-elasticsearch7-arm64-1.4,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; 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-elasticsearch8/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock index df696130b..662dfeec9 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock @@ -4,25 +4,25 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) elastic-transport (8.3.5) faraday (< 3) multi_json - elasticsearch (8.14.0) + elasticsearch (8.15.0) elastic-transport (~> 8.3) - elasticsearch-api (= 8.14.0) - elasticsearch-api (8.14.0) + elasticsearch-api (= 8.15.0) + elasticsearch-api (8.15.0) multi_json excon (0.111.0) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http ffi (1.17.0) ffi-compiler (1.3.2) @@ -103,7 +103,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) @@ -112,7 +112,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push index 85eab760f..61231945b 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/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.5-debian-elasticsearch8-arm64-1.3,v1.16-debian-elasticsearch8-arm64-2}; do +for tag in {v1.16.5-debian-elasticsearch8-arm64-1.4,v1.16-debian-elasticsearch8-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-forward/Gemfile.lock b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock index 3a057961b..9baa65215 100644 --- a/docker-image/v1.16/arm64/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -77,14 +77,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-forward/hooks/post_push b/docker-image/v1.16/arm64/debian-forward/hooks/post_push index 17ef5be0f..1ec36a054 100644 --- a/docker-image/v1.16/arm64/debian-forward/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-forward/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.5-debian-forward-arm64-1.3,v1.16-debian-forward-arm64-2}; do +for tag in {v1.16.5-debian-forward-arm64-1.4,v1.16-debian-forward-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-gcs/Gemfile.lock b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock index 0a4aca427..f6570f381 100644 --- a/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock @@ -4,16 +4,16 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http ffi (1.17.0) ffi-compiler (1.3.2) @@ -64,19 +64,19 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-apis-core (0.15.0) + google-apis-core (0.15.1) addressable (~> 2.5, >= 2.5.1) googleauth (~> 1.9) - httpclient (>= 2.8.1, < 3.a) + httpclient (>= 2.8.3, < 3.a) mini_mime (~> 1.0) + mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - rexml google-apis-iamcredentials_v1 (0.21.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.40.0) + google-apis-storage_v1 (0.42.0) google-apis-core (>= 0.15.0, < 2.a) - google-cloud-core (1.7.0) + google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (2.1.1) @@ -126,10 +126,11 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_mime (1.1.5) msgpack (1.7.2) multi_json (1.15.0) + mutex_m (0.2.0) net-http (0.4.1) uri netrc (0.11.0) @@ -137,7 +138,7 @@ GEM os (1.1.4) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) representable (3.2.0) diff --git a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push b/docker-image/v1.16/arm64/debian-gcs/hooks/post_push index 49b47de1a..659647362 100644 --- a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-gcs/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.5-debian-gcs-arm64-1.3,v1.16-debian-gcs-arm64-2}; do +for tag in {v1.16.5-debian-gcs-arm64-1.4,v1.16-debian-gcs-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-graylog/Gemfile.lock b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock index 5816f6d5a..88dbfba93 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -83,14 +83,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push b/docker-image/v1.16/arm64/debian-graylog/hooks/post_push index a5ef7c9b7..e9ea61221 100644 --- a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-graylog/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.5-debian-graylog-arm64-1.3,v1.16-debian-graylog-arm64-2}; do +for tag in {v1.16.5-debian-graylog-arm64-1.4,v1.16-debian-graylog-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-kafka/Dockerfile b/docker-image/v1.16/arm64/debian-kafka/Dockerfile index 4d3f9c450..26193740e 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" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-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 b/docker-image/v1.16/arm64/debian-kafka/Gemfile index c18564fc5..dabdf9f88 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Gemfile +++ b/docker-image/v1.16/arm64/debian-kafka/Gemfile @@ -15,11 +15,11 @@ gem "fluent-plugin-record-modifier", "~> 2.1.0" gem "fluent-plugin-detect-exceptions", "~> 0.0.13" gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0" gem "fluent-plugin-parser-cri", "~> 0.1.0" -gem "rdkafka", "~> 0.11.1" -gem "fluent-plugin-kafka", "~> 0.19.0" +gem "rdkafka", "~> 0.17.0" +gem "fluent-plugin-kafka", "~> 0.19.3" gem "fluent-plugin-avro", "~> 1.1.1" gem "fluent-plugin-parser-avro", "~> 0.3.1" -gem "snappy", "~> 0.0.15" +gem "snappy", "~> 0.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" gem "fluent-plugin-systemd", "~> 1.0.5" diff --git a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock index f9c4fc4de..86fd2e905 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock @@ -3,10 +3,10 @@ GEM specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - avro (1.11.3) + avro (1.12.0) multi_json (~> 1.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -29,7 +29,7 @@ GEM fluent-plugin-json-in-json-2 (1.0.2) fluentd (>= 0.14.0, < 2) yajl-ruby (~> 1.0) - fluent-plugin-kafka (0.19.2) + fluent-plugin-kafka (0.19.3) fluentd (>= 0.10.58, < 2) ltsv ruby-kafka (>= 1.5.0, < 2) @@ -92,7 +92,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -100,9 +100,9 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) - rdkafka (0.11.1) + rdkafka (0.17.0) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) @@ -119,7 +119,7 @@ GEM serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) - snappy (0.0.17) + snappy (0.4.0) strptime (0.2.5) strscan (3.1.0) systemd-journal (1.4.2) @@ -141,7 +141,7 @@ DEPENDENCIES fluent-plugin-detect-exceptions (~> 0.0.13) fluent-plugin-grok-parser (~> 2.6.2) fluent-plugin-json-in-json-2 (>= 1.0.2) - fluent-plugin-kafka (~> 0.19.0) + fluent-plugin-kafka (~> 0.19.3) fluent-plugin-kubernetes_metadata_filter (~> 3.4.0) fluent-plugin-multi-format-parser (~> 1.0.0) fluent-plugin-parser-avro (~> 0.3.1) @@ -152,9 +152,9 @@ DEPENDENCIES fluent-plugin-systemd (~> 1.0.5) fluentd (= 1.16.5) oj (~> 3.15.0) - rdkafka (~> 0.11.1) + rdkafka (~> 0.17.0) rexml (~> 3.2.5) - snappy (~> 0.0.15) + snappy (~> 0.4.0) BUNDLED WITH 2.4.19 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 0825b2162..a6807b821 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.5-debian-kafka-arm64-1.3,v1.16-debian-kafka-arm64-2}; do +for tag in {v1.16.5-debian-kafka-arm64-1.4,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 4d3f9c450..26193740e 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" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-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 b/docker-image/v1.16/arm64/debian-kafka2/Gemfile index c18564fc5..dabdf9f88 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Gemfile +++ b/docker-image/v1.16/arm64/debian-kafka2/Gemfile @@ -15,11 +15,11 @@ gem "fluent-plugin-record-modifier", "~> 2.1.0" gem "fluent-plugin-detect-exceptions", "~> 0.0.13" gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0" gem "fluent-plugin-parser-cri", "~> 0.1.0" -gem "rdkafka", "~> 0.11.1" -gem "fluent-plugin-kafka", "~> 0.19.0" +gem "rdkafka", "~> 0.17.0" +gem "fluent-plugin-kafka", "~> 0.19.3" gem "fluent-plugin-avro", "~> 1.1.1" gem "fluent-plugin-parser-avro", "~> 0.3.1" -gem "snappy", "~> 0.0.15" +gem "snappy", "~> 0.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" gem "fluent-plugin-systemd", "~> 1.0.5" diff --git a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock index f9c4fc4de..86fd2e905 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock @@ -3,10 +3,10 @@ GEM specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - avro (1.11.3) + avro (1.12.0) multi_json (~> 1.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -29,7 +29,7 @@ GEM fluent-plugin-json-in-json-2 (1.0.2) fluentd (>= 0.14.0, < 2) yajl-ruby (~> 1.0) - fluent-plugin-kafka (0.19.2) + fluent-plugin-kafka (0.19.3) fluentd (>= 0.10.58, < 2) ltsv ruby-kafka (>= 1.5.0, < 2) @@ -92,7 +92,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -100,9 +100,9 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) - rdkafka (0.11.1) + rdkafka (0.17.0) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) @@ -119,7 +119,7 @@ GEM serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) - snappy (0.0.17) + snappy (0.4.0) strptime (0.2.5) strscan (3.1.0) systemd-journal (1.4.2) @@ -141,7 +141,7 @@ DEPENDENCIES fluent-plugin-detect-exceptions (~> 0.0.13) fluent-plugin-grok-parser (~> 2.6.2) fluent-plugin-json-in-json-2 (>= 1.0.2) - fluent-plugin-kafka (~> 0.19.0) + fluent-plugin-kafka (~> 0.19.3) fluent-plugin-kubernetes_metadata_filter (~> 3.4.0) fluent-plugin-multi-format-parser (~> 1.0.0) fluent-plugin-parser-avro (~> 0.3.1) @@ -152,9 +152,9 @@ DEPENDENCIES fluent-plugin-systemd (~> 1.0.5) fluentd (= 1.16.5) oj (~> 3.15.0) - rdkafka (~> 0.11.1) + rdkafka (~> 0.17.0) rexml (~> 3.2.5) - snappy (~> 0.0.15) + snappy (~> 0.4.0) BUNDLED WITH 2.4.19 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 967314341..dbc98e958 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.5-debian-kafka2-arm64-1.3,v1.16-debian-kafka2-arm64-2}; do +for tag in {v1.16.5-debian-kafka2-arm64-1.4,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/arm64/debian-kinesis/Gemfile.lock b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock index c671ad901..606c84201 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock @@ -4,22 +4,22 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + aws-partitions (1.963.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.75.0) + aws-sdk-firehose (1.76.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-kinesis (1.62.0) + aws-sdk-kinesis (1.63.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -73,7 +73,7 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-protobuf (3.25.3) + google-protobuf (3.25.4) http (5.2.0) addressable (~> 2.8) base64 (~> 0.1) @@ -99,14 +99,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push b/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push index 9218681fd..c0fc959d6 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-kinesis/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.5-debian-kinesis-arm64-1.3,v1.16-debian-kinesis-arm64-2}; do +for tag in {v1.16.5-debian-kinesis-arm64-1.4,v1.16-debian-kinesis-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-logentries/Gemfile.lock b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock index 3a057961b..9baa65215 100644 --- a/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -77,14 +77,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push b/docker-image/v1.16/arm64/debian-logentries/hooks/post_push index d42f1767b..45967041e 100644 --- a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logentries/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.5-debian-logentries-arm64-1.3,v1.16-debian-logentries-arm64-2}; do +for tag in {v1.16.5-debian-logentries-arm64-1.4,v1.16-debian-logentries-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-loggly/Gemfile.lock b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock index 6f7c69caf..0d062e027 100644 --- a/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -80,7 +80,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (2.9.4) @@ -88,7 +88,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push b/docker-image/v1.16/arm64/debian-loggly/hooks/post_push index 44e54148e..3f956b1b2 100644 --- a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-loggly/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.5-debian-loggly-arm64-1.3,v1.16-debian-loggly-arm64-2}; do +for tag in {v1.16.5-debian-loggly-arm64-1.4,v1.16-debian-loggly-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-logzio/Gemfile.lock b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock index 8cdb09d27..3a525de0d 100644 --- a/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cool.io (1.8.1) domain_name (0.6.20240107) @@ -82,7 +82,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (4.0.2) @@ -91,7 +91,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push b/docker-image/v1.16/arm64/debian-logzio/hooks/post_push index 231db38e9..8e8cbb1ba 100644 --- a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logzio/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.5-debian-logzio-arm64-1.3,v1.16-debian-logzio-arm64-2}; do +for tag in {v1.16.5-debian-logzio-arm64-1.4,v1.16-debian-logzio-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-opensearch/Gemfile.lock b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock index 0151d9afc..5d23e95ad 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock @@ -4,26 +4,26 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + aws-partitions (1.963.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) excon (0.111.0) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) @@ -108,7 +108,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) @@ -120,7 +120,7 @@ GEM multi_json (>= 1.0) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push b/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push index cb87d2c1b..c7df3de9f 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-opensearch/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.5-debian-opensearch-arm64-1.3,v1.16-debian-opensearch-arm64-2}; do +for tag in {v1.16.5-debian-opensearch-arm64-1.4,v1.16-debian-opensearch-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-papertrail/Gemfile.lock b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock index 8c0a4d2f6..6055d7405 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -83,14 +83,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push b/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push index be9bcd169..a42ab8834 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-papertrail/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.5-debian-papertrail-arm64-1.3,v1.16-debian-papertrail-arm64-2}; do +for tag in {v1.16.5-debian-papertrail-arm64-1.4,v1.16-debian-papertrail-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-s3/Gemfile.lock b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock index 01f52b500..8d580dd19 100644 --- a/docker-image/v1.16/arm64/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock @@ -4,8 +4,8 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + aws-partitions (1.963.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -13,17 +13,17 @@ GEM aws-sdk-kms (1.88.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.156.0) + aws-sdk-s3 (1.157.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sdk-sqs (1.80.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -101,14 +101,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/arm64/debian-s3/hooks/post_push b/docker-image/v1.16/arm64/debian-s3/hooks/post_push index 09c880b60..ed68719a9 100644 --- a/docker-image/v1.16/arm64/debian-s3/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-s3/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.5-debian-s3-arm64-1.3,v1.16-debian-s3-arm64-2}; do +for tag in {v1.16.5-debian-s3-arm64-1.4,v1.16-debian-s3-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-syslog/Gemfile.lock b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock index de091e8f9..6d5ac74a0 100644 --- a/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -80,14 +80,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) remote_syslog_sender (1.2.2) diff --git a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push b/docker-image/v1.16/arm64/debian-syslog/hooks/post_push index d0349d268..7b5e48733 100644 --- a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-syslog/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.5-debian-syslog-arm64-1.3,v1.16-debian-syslog-arm64-2}; do +for tag in {v1.16.5-debian-syslog-arm64-1.4,v1.16-debian-syslog-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-azureblob/Gemfile.lock b/docker-image/v1.16/debian-azureblob/Gemfile.lock index 9b66c4568..51c2c9f78 100644 --- a/docker-image/v1.16/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/debian-azureblob/Gemfile.lock @@ -12,7 +12,7 @@ GEM net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cool.io (1.8.1) domain_name (0.6.20240107) @@ -34,7 +34,7 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) @@ -114,7 +114,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -122,14 +122,14 @@ GEM net-http-persistent (4.0.2) connection_pool (~> 2.2) netrc (0.11.0) - nokogiri (1.16.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) - racc (1.8.0) + public_suffix (6.0.1) + racc (1.8.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-azureblob/hooks/post_push b/docker-image/v1.16/debian-azureblob/hooks/post_push index 077eab031..73e2cc073 100644 --- a/docker-image/v1.16/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/debian-azureblob/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.5-debian-azureblob-amd64-1.3,v1.16-debian-azureblob-amd64-2}; do +for tag in {v1.16.5-debian-azureblob-amd64-1.4,v1.16-debian-azureblob-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-cloudwatch/Gemfile.lock b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock index 2e20422ce..e9252ec04 100644 --- a/docker-image/v1.16/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock @@ -4,19 +4,19 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-cloudwatchlogs (1.87.0) + aws-partitions (1.963.0) + aws-sdk-cloudwatchlogs (1.88.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.201.1) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -93,14 +93,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/debian-cloudwatch/hooks/post_push index 92a1990d1..c6d8c4320 100644 --- a/docker-image/v1.16/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/debian-cloudwatch/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.5-debian-cloudwatch-amd64-1.3,v1.16-debian-cloudwatch-amd64-2}; do +for tag in {v1.16.5-debian-cloudwatch-amd64-1.4,v1.16-debian-cloudwatch-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-elasticsearch7/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock index 45c1cc4eb..8b3dca5b9 100644 --- a/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) elasticsearch (7.17.11) @@ -37,7 +37,7 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) @@ -119,7 +119,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) multipart-post (2.4.1) @@ -127,7 +127,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/debian-elasticsearch7/hooks/post_push index a0112b0fc..315cbdb43 100644 --- a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch7/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.5-debian-elasticsearch7-amd64-1.3,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; do +for tag in {v1.16.5-debian-elasticsearch7-amd64-1.4,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; 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-elasticsearch8/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock index df696130b..662dfeec9 100644 --- a/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock @@ -4,25 +4,25 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) elastic-transport (8.3.5) faraday (< 3) multi_json - elasticsearch (8.14.0) + elasticsearch (8.15.0) elastic-transport (~> 8.3) - elasticsearch-api (= 8.14.0) - elasticsearch-api (8.14.0) + elasticsearch-api (= 8.15.0) + elasticsearch-api (8.15.0) multi_json excon (0.111.0) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http ffi (1.17.0) ffi-compiler (1.3.2) @@ -103,7 +103,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) @@ -112,7 +112,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/debian-elasticsearch8/hooks/post_push index 4d4ec0d10..8c0d72f83 100644 --- a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch8/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.5-debian-elasticsearch8-amd64-1.3,v1.16-debian-elasticsearch8-amd64-2}; do +for tag in {v1.16.5-debian-elasticsearch8-amd64-1.4,v1.16-debian-elasticsearch8-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-forward/Gemfile.lock b/docker-image/v1.16/debian-forward/Gemfile.lock index 3a057961b..9baa65215 100644 --- a/docker-image/v1.16/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/debian-forward/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -77,14 +77,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-forward/hooks/post_push b/docker-image/v1.16/debian-forward/hooks/post_push index 0773f4275..e66f13e35 100644 --- a/docker-image/v1.16/debian-forward/hooks/post_push +++ b/docker-image/v1.16/debian-forward/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.5-debian-forward-amd64-1.3,v1.16-debian-forward-amd64-2}; do +for tag in {v1.16.5-debian-forward-amd64-1.4,v1.16-debian-forward-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-gcs/Gemfile.lock b/docker-image/v1.16/debian-gcs/Gemfile.lock index 0a4aca427..f6570f381 100644 --- a/docker-image/v1.16/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/debian-gcs/Gemfile.lock @@ -4,16 +4,16 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http ffi (1.17.0) ffi-compiler (1.3.2) @@ -64,19 +64,19 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-apis-core (0.15.0) + google-apis-core (0.15.1) addressable (~> 2.5, >= 2.5.1) googleauth (~> 1.9) - httpclient (>= 2.8.1, < 3.a) + httpclient (>= 2.8.3, < 3.a) mini_mime (~> 1.0) + mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - rexml google-apis-iamcredentials_v1 (0.21.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.40.0) + google-apis-storage_v1 (0.42.0) google-apis-core (>= 0.15.0, < 2.a) - google-cloud-core (1.7.0) + google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (2.1.1) @@ -126,10 +126,11 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_mime (1.1.5) msgpack (1.7.2) multi_json (1.15.0) + mutex_m (0.2.0) net-http (0.4.1) uri netrc (0.11.0) @@ -137,7 +138,7 @@ GEM os (1.1.4) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) representable (3.2.0) diff --git a/docker-image/v1.16/debian-gcs/hooks/post_push b/docker-image/v1.16/debian-gcs/hooks/post_push index d64409f75..d487dc1b2 100644 --- a/docker-image/v1.16/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/debian-gcs/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.5-debian-gcs-amd64-1.3,v1.16-debian-gcs-amd64-2}; do +for tag in {v1.16.5-debian-gcs-amd64-1.4,v1.16-debian-gcs-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-graylog/Gemfile.lock b/docker-image/v1.16/debian-graylog/Gemfile.lock index 5816f6d5a..88dbfba93 100644 --- a/docker-image/v1.16/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/debian-graylog/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -83,14 +83,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-graylog/hooks/post_push b/docker-image/v1.16/debian-graylog/hooks/post_push index bf2e82859..7c305c242 100644 --- a/docker-image/v1.16/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/debian-graylog/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.5-debian-graylog-amd64-1.3,v1.16-debian-graylog-amd64-2}; do +for tag in {v1.16.5-debian-graylog-amd64-1.4,v1.16-debian-graylog-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-kafka/Dockerfile b/docker-image/v1.16/debian-kafka/Dockerfile index 2b40f7fee..0d37b2760 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" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-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 b/docker-image/v1.16/debian-kafka/Gemfile index c18564fc5..dabdf9f88 100644 --- a/docker-image/v1.16/debian-kafka/Gemfile +++ b/docker-image/v1.16/debian-kafka/Gemfile @@ -15,11 +15,11 @@ gem "fluent-plugin-record-modifier", "~> 2.1.0" gem "fluent-plugin-detect-exceptions", "~> 0.0.13" gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0" gem "fluent-plugin-parser-cri", "~> 0.1.0" -gem "rdkafka", "~> 0.11.1" -gem "fluent-plugin-kafka", "~> 0.19.0" +gem "rdkafka", "~> 0.17.0" +gem "fluent-plugin-kafka", "~> 0.19.3" gem "fluent-plugin-avro", "~> 1.1.1" gem "fluent-plugin-parser-avro", "~> 0.3.1" -gem "snappy", "~> 0.0.15" +gem "snappy", "~> 0.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" gem "fluent-plugin-systemd", "~> 1.0.5" diff --git a/docker-image/v1.16/debian-kafka/Gemfile.lock b/docker-image/v1.16/debian-kafka/Gemfile.lock index f9c4fc4de..86fd2e905 100644 --- a/docker-image/v1.16/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka/Gemfile.lock @@ -3,10 +3,10 @@ GEM specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - avro (1.11.3) + avro (1.12.0) multi_json (~> 1.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -29,7 +29,7 @@ GEM fluent-plugin-json-in-json-2 (1.0.2) fluentd (>= 0.14.0, < 2) yajl-ruby (~> 1.0) - fluent-plugin-kafka (0.19.2) + fluent-plugin-kafka (0.19.3) fluentd (>= 0.10.58, < 2) ltsv ruby-kafka (>= 1.5.0, < 2) @@ -92,7 +92,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -100,9 +100,9 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) - rdkafka (0.11.1) + rdkafka (0.17.0) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) @@ -119,7 +119,7 @@ GEM serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) - snappy (0.0.17) + snappy (0.4.0) strptime (0.2.5) strscan (3.1.0) systemd-journal (1.4.2) @@ -141,7 +141,7 @@ DEPENDENCIES fluent-plugin-detect-exceptions (~> 0.0.13) fluent-plugin-grok-parser (~> 2.6.2) fluent-plugin-json-in-json-2 (>= 1.0.2) - fluent-plugin-kafka (~> 0.19.0) + fluent-plugin-kafka (~> 0.19.3) fluent-plugin-kubernetes_metadata_filter (~> 3.4.0) fluent-plugin-multi-format-parser (~> 1.0.0) fluent-plugin-parser-avro (~> 0.3.1) @@ -152,9 +152,9 @@ DEPENDENCIES fluent-plugin-systemd (~> 1.0.5) fluentd (= 1.16.5) oj (~> 3.15.0) - rdkafka (~> 0.11.1) + rdkafka (~> 0.17.0) rexml (~> 3.2.5) - snappy (~> 0.0.15) + snappy (~> 0.4.0) BUNDLED WITH 2.4.19 diff --git a/docker-image/v1.16/debian-kafka/hooks/post_push b/docker-image/v1.16/debian-kafka/hooks/post_push index 47fa80c2f..7ef9edc65 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.5-debian-kafka-amd64-1.3,v1.16-debian-kafka-amd64-2}; do +for tag in {v1.16.5-debian-kafka-amd64-1.4,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 2b40f7fee..0d37b2760 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" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-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 b/docker-image/v1.16/debian-kafka2/Gemfile index c18564fc5..dabdf9f88 100644 --- a/docker-image/v1.16/debian-kafka2/Gemfile +++ b/docker-image/v1.16/debian-kafka2/Gemfile @@ -15,11 +15,11 @@ gem "fluent-plugin-record-modifier", "~> 2.1.0" gem "fluent-plugin-detect-exceptions", "~> 0.0.13" gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0" gem "fluent-plugin-parser-cri", "~> 0.1.0" -gem "rdkafka", "~> 0.11.1" -gem "fluent-plugin-kafka", "~> 0.19.0" +gem "rdkafka", "~> 0.17.0" +gem "fluent-plugin-kafka", "~> 0.19.3" gem "fluent-plugin-avro", "~> 1.1.1" gem "fluent-plugin-parser-avro", "~> 0.3.1" -gem "snappy", "~> 0.0.15" +gem "snappy", "~> 0.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" gem "fluent-plugin-systemd", "~> 1.0.5" diff --git a/docker-image/v1.16/debian-kafka2/Gemfile.lock b/docker-image/v1.16/debian-kafka2/Gemfile.lock index f9c4fc4de..86fd2e905 100644 --- a/docker-image/v1.16/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka2/Gemfile.lock @@ -3,10 +3,10 @@ GEM specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - avro (1.11.3) + avro (1.12.0) multi_json (~> 1.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -29,7 +29,7 @@ GEM fluent-plugin-json-in-json-2 (1.0.2) fluentd (>= 0.14.0, < 2) yajl-ruby (~> 1.0) - fluent-plugin-kafka (0.19.2) + fluent-plugin-kafka (0.19.3) fluentd (>= 0.10.58, < 2) ltsv ruby-kafka (>= 1.5.0, < 2) @@ -92,7 +92,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -100,9 +100,9 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) - rdkafka (0.11.1) + rdkafka (0.17.0) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) @@ -119,7 +119,7 @@ GEM serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) - snappy (0.0.17) + snappy (0.4.0) strptime (0.2.5) strscan (3.1.0) systemd-journal (1.4.2) @@ -141,7 +141,7 @@ DEPENDENCIES fluent-plugin-detect-exceptions (~> 0.0.13) fluent-plugin-grok-parser (~> 2.6.2) fluent-plugin-json-in-json-2 (>= 1.0.2) - fluent-plugin-kafka (~> 0.19.0) + fluent-plugin-kafka (~> 0.19.3) fluent-plugin-kubernetes_metadata_filter (~> 3.4.0) fluent-plugin-multi-format-parser (~> 1.0.0) fluent-plugin-parser-avro (~> 0.3.1) @@ -152,9 +152,9 @@ DEPENDENCIES fluent-plugin-systemd (~> 1.0.5) fluentd (= 1.16.5) oj (~> 3.15.0) - rdkafka (~> 0.11.1) + rdkafka (~> 0.17.0) rexml (~> 3.2.5) - snappy (~> 0.0.15) + snappy (~> 0.4.0) BUNDLED WITH 2.4.19 diff --git a/docker-image/v1.16/debian-kafka2/hooks/post_push b/docker-image/v1.16/debian-kafka2/hooks/post_push index 1daaa4e9b..9682b3ecd 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.5-debian-kafka2-amd64-1.3,v1.16-debian-kafka2-amd64-2}; do +for tag in {v1.16.5-debian-kafka2-amd64-1.4,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 diff --git a/docker-image/v1.16/debian-kinesis/Gemfile.lock b/docker-image/v1.16/debian-kinesis/Gemfile.lock index c671ad901..606c84201 100644 --- a/docker-image/v1.16/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/debian-kinesis/Gemfile.lock @@ -4,22 +4,22 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + aws-partitions (1.963.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.75.0) + aws-sdk-firehose (1.76.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-kinesis (1.62.0) + aws-sdk-kinesis (1.63.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -73,7 +73,7 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-protobuf (3.25.3) + google-protobuf (3.25.4) http (5.2.0) addressable (~> 2.8) base64 (~> 0.1) @@ -99,14 +99,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-kinesis/hooks/post_push b/docker-image/v1.16/debian-kinesis/hooks/post_push index ef24c5ef7..0e4a78194 100644 --- a/docker-image/v1.16/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/debian-kinesis/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.5-debian-kinesis-amd64-1.3,v1.16-debian-kinesis-amd64-2}; do +for tag in {v1.16.5-debian-kinesis-amd64-1.4,v1.16-debian-kinesis-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-logentries/Gemfile.lock b/docker-image/v1.16/debian-logentries/Gemfile.lock index 3a057961b..9baa65215 100644 --- a/docker-image/v1.16/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/debian-logentries/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -77,14 +77,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-logentries/hooks/post_push b/docker-image/v1.16/debian-logentries/hooks/post_push index eb13b3ef3..6c96c03b6 100644 --- a/docker-image/v1.16/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/debian-logentries/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.5-debian-logentries-amd64-1.3,v1.16-debian-logentries-amd64-2}; do +for tag in {v1.16.5-debian-logentries-amd64-1.4,v1.16-debian-logentries-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-loggly/Gemfile.lock b/docker-image/v1.16/debian-loggly/Gemfile.lock index 6f7c69caf..0d062e027 100644 --- a/docker-image/v1.16/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/debian-loggly/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -80,7 +80,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (2.9.4) @@ -88,7 +88,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-loggly/hooks/post_push b/docker-image/v1.16/debian-loggly/hooks/post_push index 3936b7317..8a2f9b64a 100644 --- a/docker-image/v1.16/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/debian-loggly/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.5-debian-loggly-amd64-1.3,v1.16-debian-loggly-amd64-2}; do +for tag in {v1.16.5-debian-loggly-amd64-1.4,v1.16-debian-loggly-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-logzio/Gemfile.lock b/docker-image/v1.16/debian-logzio/Gemfile.lock index 8cdb09d27..3a525de0d 100644 --- a/docker-image/v1.16/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/debian-logzio/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cool.io (1.8.1) domain_name (0.6.20240107) @@ -82,7 +82,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (4.0.2) @@ -91,7 +91,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-logzio/hooks/post_push b/docker-image/v1.16/debian-logzio/hooks/post_push index 1bc775825..998a056d3 100644 --- a/docker-image/v1.16/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/debian-logzio/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.5-debian-logzio-amd64-1.3,v1.16-debian-logzio-amd64-2}; do +for tag in {v1.16.5-debian-logzio-amd64-1.4,v1.16-debian-logzio-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-opensearch/Gemfile.lock b/docker-image/v1.16/debian-opensearch/Gemfile.lock index 0151d9afc..5d23e95ad 100644 --- a/docker-image/v1.16/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/debian-opensearch/Gemfile.lock @@ -4,26 +4,26 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + aws-partitions (1.963.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) excon (0.111.0) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) @@ -108,7 +108,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) @@ -120,7 +120,7 @@ GEM multi_json (>= 1.0) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-opensearch/hooks/post_push b/docker-image/v1.16/debian-opensearch/hooks/post_push index 5ee6cb7ce..dddf74578 100644 --- a/docker-image/v1.16/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/debian-opensearch/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.5-debian-opensearch-amd64-1.3,v1.16-debian-opensearch-amd64-2}; do +for tag in {v1.16.5-debian-opensearch-amd64-1.4,v1.16-debian-opensearch-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-papertrail/Gemfile.lock b/docker-image/v1.16/debian-papertrail/Gemfile.lock index 8c0a4d2f6..6055d7405 100644 --- a/docker-image/v1.16/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/debian-papertrail/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -83,14 +83,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-papertrail/hooks/post_push b/docker-image/v1.16/debian-papertrail/hooks/post_push index 880dff1f3..ec1c73259 100644 --- a/docker-image/v1.16/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/debian-papertrail/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.5-debian-papertrail-amd64-1.3,v1.16-debian-papertrail-amd64-2}; do +for tag in {v1.16.5-debian-papertrail-amd64-1.4,v1.16-debian-papertrail-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-s3/Gemfile.lock b/docker-image/v1.16/debian-s3/Gemfile.lock index 01f52b500..8d580dd19 100644 --- a/docker-image/v1.16/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/debian-s3/Gemfile.lock @@ -4,8 +4,8 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + aws-partitions (1.963.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -13,17 +13,17 @@ GEM aws-sdk-kms (1.88.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.156.0) + aws-sdk-s3 (1.157.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sdk-sqs (1.80.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -101,14 +101,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-s3/hooks/post_push b/docker-image/v1.16/debian-s3/hooks/post_push index 722d539b0..74383e515 100644 --- a/docker-image/v1.16/debian-s3/hooks/post_push +++ b/docker-image/v1.16/debian-s3/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.5-debian-s3-amd64-1.3,v1.16-debian-s3-amd64-2}; do +for tag in {v1.16.5-debian-s3-amd64-1.4,v1.16-debian-s3-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-syslog/Gemfile.lock b/docker-image/v1.16/debian-syslog/Gemfile.lock index de091e8f9..6d5ac74a0 100644 --- a/docker-image/v1.16/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/debian-syslog/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -80,14 +80,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) remote_syslog_sender (1.2.2) diff --git a/docker-image/v1.16/debian-syslog/hooks/post_push b/docker-image/v1.16/debian-syslog/hooks/post_push index c76f808f3..6ad2898bb 100644 --- a/docker-image/v1.16/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/debian-syslog/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.5-debian-syslog-amd64-1.3,v1.16-debian-syslog-amd64-2}; do +for tag in {v1.16.5-debian-syslog-amd64-1.4,v1.16-debian-syslog-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/templates/Dockerfile.erb b/templates/Dockerfile.erb index ae1b44285..f0b8968ed 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<% 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<% 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 \ diff --git a/templates/Gemfile.erb b/templates/Gemfile.erb index 1eb5ed4c3..a32a6d168 100644 --- a/templates/Gemfile.erb +++ b/templates/Gemfile.erb @@ -54,11 +54,11 @@ gem "fluent-plugin-papertrail", "~> 0.2.6" <% when "syslog" %> gem "fluent-plugin-remote_syslog" <% when "kafka", "kafka2" %> -gem "rdkafka", "~> 0.11.1" -gem "fluent-plugin-kafka", "~> 0.19.0" +gem "rdkafka", "~> 0.17.0" +gem "fluent-plugin-kafka", "~> 0.19.3" gem "fluent-plugin-avro", "~> 1.1.1" gem "fluent-plugin-parser-avro", "~> 0.3.1" -gem "snappy", "~> 0.0.15" +gem "snappy", "~> 0.4.0" <% when "kinesis" %> gem "fluent-plugin-kinesis", "~> 3.4.0" <% when "splunkhec" %> From aedac6c45bd4a4653710f93aff09a962e39bcc84 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Tue, 20 Aug 2024 17:21:56 +0900 Subject: [PATCH 16/26] Bump up version to v1.16.6 Signed-off-by: Kentaro Hayashi --- Makefile | 68 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 8c3a640ef..95cf23e3e 100644 --- a/Makefile +++ b/Makefile @@ -12,44 +12,44 @@ IMAGE_NAME := fluent/fluentd-kubernetes X86_IMAGES := \ - v1.16/debian-azureblob:v1.16.5-debian-azureblob-amd64-1.4,v1.16-debian-azureblob-amd64-2 \ - v1.16/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-amd64-1.4,v1.16-debian-elasticsearch8-amd64-2 \ - v1.16/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-amd64-1.4,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ - v1.16/debian-opensearch:v1.16.5-debian-opensearch-amd64-1.4,v1.16-debian-opensearch-amd64-2 \ - v1.16/debian-loggly:v1.16.5-debian-loggly-amd64-1.4,v1.16-debian-loggly-amd64-2 \ - v1.16/debian-logentries:v1.16.5-debian-logentries-amd64-1.4,v1.16-debian-logentries-amd64-2 \ - v1.16/debian-cloudwatch:v1.16.5-debian-cloudwatch-amd64-1.4,v1.16-debian-cloudwatch-amd64-2 \ - v1.16/debian-s3:v1.16.5-debian-s3-amd64-1.4,v1.16-debian-s3-amd64-2 \ - v1.16/debian-syslog:v1.16.5-debian-syslog-amd64-1.4,v1.16-debian-syslog-amd64-2 \ - v1.16/debian-forward:v1.16.5-debian-forward-amd64-1.4,v1.16-debian-forward-amd64-2 \ - v1.16/debian-gcs:v1.16.5-debian-gcs-amd64-1.4,v1.16-debian-gcs-amd64-2 \ - v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.4,v1.16-debian-graylog-amd64-2 \ - v1.16/debian-papertrail:v1.16.5-debian-papertrail-amd64-1.4,v1.16-debian-papertrail-amd64-2 \ - v1.16/debian-logzio:v1.16.5-debian-logzio-amd64-1.4,v1.16-debian-logzio-amd64-2 \ - v1.16/debian-kafka:v1.16.5-debian-kafka-amd64-1.4,v1.16-debian-kafka-amd64-2 \ - v1.16/debian-kafka2:v1.16.5-debian-kafka2-amd64-1.4,v1.16-debian-kafka2-amd64-2 \ - v1.16/debian-kinesis:v1.16.5-debian-kinesis-amd64-1.4,v1.16-debian-kinesis-amd64-2 + v1.16/debian-azureblob:v1.16.6-debian-azureblob-amd64-1.0,v1.16-debian-azureblob-amd64-2 \ + v1.16/debian-elasticsearch8:v1.16.6-debian-elasticsearch8-amd64-1.0,v1.16-debian-elasticsearch8-amd64-2 \ + v1.16/debian-elasticsearch7:v1.16.6-debian-elasticsearch7-amd64-1.0,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ + v1.16/debian-opensearch:v1.16.6-debian-opensearch-amd64-1.0,v1.16-debian-opensearch-amd64-2 \ + v1.16/debian-loggly:v1.16.6-debian-loggly-amd64-1.0,v1.16-debian-loggly-amd64-2 \ + v1.16/debian-logentries:v1.16.6-debian-logentries-amd64-1.0,v1.16-debian-logentries-amd64-2 \ + v1.16/debian-cloudwatch:v1.16.6-debian-cloudwatch-amd64-1.0,v1.16-debian-cloudwatch-amd64-2 \ + v1.16/debian-s3:v1.16.6-debian-s3-amd64-1.0,v1.16-debian-s3-amd64-2 \ + v1.16/debian-syslog:v1.16.6-debian-syslog-amd64-1.0,v1.16-debian-syslog-amd64-2 \ + v1.16/debian-forward:v1.16.6-debian-forward-amd64-1.0,v1.16-debian-forward-amd64-2 \ + v1.16/debian-gcs:v1.16.6-debian-gcs-amd64-1.0,v1.16-debian-gcs-amd64-2 \ + 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-kinesis:v1.16.6-debian-kinesis-amd64-1.0,v1.16-debian-kinesis-amd64-2 # :,,,... ARM64_IMAGES := \ - v1.16/arm64/debian-azureblob:v1.16.5-debian-azureblob-arm64-1.4,v1.16-debian-azureblob-arm64-2 \ - v1.16/arm64/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-arm64-1.4,v1.16-debian-elasticsearch8-arm64-2 \ - v1.16/arm64/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-arm64-1.4,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ - v1.16/arm64/debian-opensearch:v1.16.5-debian-opensearch-arm64-1.4,v1.16-debian-opensearch-arm64-2 \ - v1.16/arm64/debian-loggly:v1.16.5-debian-loggly-arm64-1.4,v1.16-debian-loggly-arm64-2 \ - v1.16/arm64/debian-logentries:v1.16.5-debian-logentries-arm64-1.4,v1.16-debian-logentries-arm64-2 \ - v1.16/arm64/debian-cloudwatch:v1.16.5-debian-cloudwatch-arm64-1.4,v1.16-debian-cloudwatch-arm64-2 \ - v1.16/arm64/debian-s3:v1.16.5-debian-s3-arm64-1.4,v1.16-debian-s3-arm64-2 \ - v1.16/arm64/debian-syslog:v1.16.5-debian-syslog-arm64-1.4,v1.16-debian-syslog-arm64-2 \ - v1.16/arm64/debian-forward:v1.16.5-debian-forward-arm64-1.4,v1.16-debian-forward-arm64-2 \ - v1.16/arm64/debian-gcs:v1.16.5-debian-gcs-arm64-1.4,v1.16-debian-gcs-arm64-2 \ - v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.4,v1.16-debian-graylog-arm64-2 \ - v1.16/arm64/debian-papertrail:v1.16.5-debian-papertrail-arm64-1.4,v1.16-debian-papertrail-arm64-2 \ - v1.16/arm64/debian-logzio:v1.16.5-debian-logzio-arm64-1.4,v1.16-debian-logzio-arm64-2 \ - v1.16/arm64/debian-kafka:v1.16.5-debian-kafka-arm64-1.4,v1.16-debian-kafka-arm64-2 \ - v1.16/arm64/debian-kafka2:v1.16.5-debian-kafka2-arm64-1.4,v1.16-debian-kafka2-arm64-2 \ - v1.16/arm64/debian-kinesis:v1.16.5-debian-kinesis-arm64-1.4,v1.16-debian-kinesis-arm64-2 + v1.16/arm64/debian-azureblob:v1.16.6-debian-azureblob-arm64-1.0,v1.16-debian-azureblob-arm64-2 \ + v1.16/arm64/debian-elasticsearch8:v1.16.6-debian-elasticsearch8-arm64-1.0,v1.16-debian-elasticsearch8-arm64-2 \ + v1.16/arm64/debian-elasticsearch7:v1.16.6-debian-elasticsearch7-arm64-1.0,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ + v1.16/arm64/debian-opensearch:v1.16.6-debian-opensearch-arm64-1.0,v1.16-debian-opensearch-arm64-2 \ + v1.16/arm64/debian-loggly:v1.16.6-debian-loggly-arm64-1.0,v1.16-debian-loggly-arm64-2 \ + v1.16/arm64/debian-logentries:v1.16.6-debian-logentries-arm64-1.0,v1.16-debian-logentries-arm64-2 \ + v1.16/arm64/debian-cloudwatch:v1.16.6-debian-cloudwatch-arm64-1.0,v1.16-debian-cloudwatch-arm64-2 \ + v1.16/arm64/debian-s3:v1.16.6-debian-s3-arm64-1.0,v1.16-debian-s3-arm64-2 \ + v1.16/arm64/debian-syslog:v1.16.6-debian-syslog-arm64-1.0,v1.16-debian-syslog-arm64-2 \ + v1.16/arm64/debian-forward:v1.16.6-debian-forward-arm64-1.0,v1.16-debian-forward-arm64-2 \ + v1.16/arm64/debian-gcs:v1.16.6-debian-gcs-arm64-1.0,v1.16-debian-gcs-arm64-2 \ + 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-kinesis:v1.16.6-debian-kinesis-arm64-1.0,v1.16-debian-kinesis-arm64-2 ALL_IMAGES := $(X86_IMAGES) $(ARM64_IMAGES) From e4d40bc1341486a0d72b824bf3308a8376dfbac2 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Tue, 20 Aug 2024 17:28:28 +0900 Subject: [PATCH 17/26] Add v1.16.6 images Signed-off-by: Kentaro Hayashi --- README.md | 74 +++++++++---------- .../v1.16/arm64/debian-azureblob/Dockerfile | 2 +- .../v1.16/arm64/debian-azureblob/Gemfile | 2 +- .../v1.16/arm64/debian-azureblob/Gemfile.lock | 16 +++- .../arm64/debian-azureblob/hooks/post_push | 2 +- .../v1.16/arm64/debian-cloudwatch/Dockerfile | 2 +- .../v1.16/arm64/debian-cloudwatch/Gemfile | 2 +- .../arm64/debian-cloudwatch/Gemfile.lock | 22 ++++-- .../arm64/debian-cloudwatch/hooks/post_push | 2 +- .../arm64/debian-elasticsearch7/Dockerfile | 2 +- .../v1.16/arm64/debian-elasticsearch7/Gemfile | 2 +- .../arm64/debian-elasticsearch7/Gemfile.lock | 16 +++- .../debian-elasticsearch7/hooks/post_push | 2 +- .../arm64/debian-elasticsearch8/Dockerfile | 2 +- .../v1.16/arm64/debian-elasticsearch8/Gemfile | 2 +- .../arm64/debian-elasticsearch8/Gemfile.lock | 16 +++- .../debian-elasticsearch8/hooks/post_push | 2 +- .../v1.16/arm64/debian-forward/Dockerfile | 2 +- .../v1.16/arm64/debian-forward/Gemfile | 2 +- .../v1.16/arm64/debian-forward/Gemfile.lock | 16 +++- .../arm64/debian-forward/hooks/post_push | 2 +- .../v1.16/arm64/debian-gcs/Dockerfile | 2 +- docker-image/v1.16/arm64/debian-gcs/Gemfile | 2 +- .../v1.16/arm64/debian-gcs/Gemfile.lock | 18 ++++- .../v1.16/arm64/debian-gcs/hooks/post_push | 2 +- .../v1.16/arm64/debian-graylog/Dockerfile | 2 +- .../v1.16/arm64/debian-graylog/Gemfile | 2 +- .../v1.16/arm64/debian-graylog/Gemfile.lock | 15 +++- .../arm64/debian-graylog/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka/Dockerfile | 2 +- docker-image/v1.16/arm64/debian-kafka/Gemfile | 2 +- .../v1.16/arm64/debian-kafka/Gemfile.lock | 16 +++- .../v1.16/arm64/debian-kafka/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka2/Dockerfile | 2 +- .../v1.16/arm64/debian-kafka2/Gemfile | 2 +- .../v1.16/arm64/debian-kafka2/Gemfile.lock | 16 +++- .../v1.16/arm64/debian-kafka2/hooks/post_push | 2 +- .../v1.16/arm64/debian-kinesis/Dockerfile | 2 +- .../v1.16/arm64/debian-kinesis/Gemfile | 2 +- .../v1.16/arm64/debian-kinesis/Gemfile.lock | 22 ++++-- .../arm64/debian-kinesis/hooks/post_push | 2 +- .../v1.16/arm64/debian-logentries/Dockerfile | 2 +- .../v1.16/arm64/debian-logentries/Gemfile | 2 +- .../arm64/debian-logentries/Gemfile.lock | 16 +++- .../arm64/debian-logentries/hooks/post_push | 2 +- .../v1.16/arm64/debian-loggly/Dockerfile | 2 +- .../v1.16/arm64/debian-loggly/Gemfile | 2 +- .../v1.16/arm64/debian-loggly/Gemfile.lock | 16 +++- .../v1.16/arm64/debian-loggly/hooks/post_push | 2 +- .../v1.16/arm64/debian-logzio/Dockerfile | 2 +- .../v1.16/arm64/debian-logzio/Gemfile | 2 +- .../v1.16/arm64/debian-logzio/Gemfile.lock | 16 +++- .../v1.16/arm64/debian-logzio/hooks/post_push | 2 +- .../v1.16/arm64/debian-opensearch/Dockerfile | 2 +- .../v1.16/arm64/debian-opensearch/Gemfile | 2 +- .../arm64/debian-opensearch/Gemfile.lock | 22 ++++-- .../arm64/debian-opensearch/hooks/post_push | 2 +- .../v1.16/arm64/debian-papertrail/Dockerfile | 2 +- .../v1.16/arm64/debian-papertrail/Gemfile | 2 +- .../arm64/debian-papertrail/Gemfile.lock | 16 +++- .../arm64/debian-papertrail/hooks/post_push | 2 +- docker-image/v1.16/arm64/debian-s3/Dockerfile | 2 +- docker-image/v1.16/arm64/debian-s3/Gemfile | 2 +- .../v1.16/arm64/debian-s3/Gemfile.lock | 24 ++++-- .../v1.16/arm64/debian-s3/hooks/post_push | 2 +- .../v1.16/arm64/debian-syslog/Dockerfile | 2 +- .../v1.16/arm64/debian-syslog/Gemfile | 2 +- .../v1.16/arm64/debian-syslog/Gemfile.lock | 16 +++- .../v1.16/arm64/debian-syslog/hooks/post_push | 2 +- .../v1.16/debian-azureblob/Dockerfile | 2 +- docker-image/v1.16/debian-azureblob/Gemfile | 2 +- .../v1.16/debian-azureblob/Gemfile.lock | 16 +++- .../v1.16/debian-azureblob/hooks/post_push | 2 +- .../v1.16/debian-cloudwatch/Dockerfile | 2 +- docker-image/v1.16/debian-cloudwatch/Gemfile | 2 +- .../v1.16/debian-cloudwatch/Gemfile.lock | 22 ++++-- .../v1.16/debian-cloudwatch/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch7/Dockerfile | 2 +- .../v1.16/debian-elasticsearch7/Gemfile | 2 +- .../v1.16/debian-elasticsearch7/Gemfile.lock | 16 +++- .../debian-elasticsearch7/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch8/Dockerfile | 2 +- .../v1.16/debian-elasticsearch8/Gemfile | 2 +- .../v1.16/debian-elasticsearch8/Gemfile.lock | 16 +++- .../debian-elasticsearch8/hooks/post_push | 2 +- docker-image/v1.16/debian-forward/Dockerfile | 2 +- docker-image/v1.16/debian-forward/Gemfile | 2 +- .../v1.16/debian-forward/Gemfile.lock | 16 +++- .../v1.16/debian-forward/hooks/post_push | 2 +- docker-image/v1.16/debian-gcs/Dockerfile | 2 +- docker-image/v1.16/debian-gcs/Gemfile | 2 +- docker-image/v1.16/debian-gcs/Gemfile.lock | 18 ++++- docker-image/v1.16/debian-gcs/hooks/post_push | 2 +- docker-image/v1.16/debian-graylog/Dockerfile | 2 +- docker-image/v1.16/debian-graylog/Gemfile | 2 +- .../v1.16/debian-graylog/Gemfile.lock | 15 +++- .../v1.16/debian-graylog/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka/Dockerfile | 2 +- docker-image/v1.16/debian-kafka/Gemfile | 2 +- docker-image/v1.16/debian-kafka/Gemfile.lock | 16 +++- .../v1.16/debian-kafka/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka2/Dockerfile | 2 +- docker-image/v1.16/debian-kafka2/Gemfile | 2 +- docker-image/v1.16/debian-kafka2/Gemfile.lock | 16 +++- .../v1.16/debian-kafka2/hooks/post_push | 2 +- docker-image/v1.16/debian-kinesis/Dockerfile | 2 +- docker-image/v1.16/debian-kinesis/Gemfile | 2 +- .../v1.16/debian-kinesis/Gemfile.lock | 22 ++++-- .../v1.16/debian-kinesis/hooks/post_push | 2 +- .../v1.16/debian-logentries/Dockerfile | 2 +- docker-image/v1.16/debian-logentries/Gemfile | 2 +- .../v1.16/debian-logentries/Gemfile.lock | 16 +++- .../v1.16/debian-logentries/hooks/post_push | 2 +- docker-image/v1.16/debian-loggly/Dockerfile | 2 +- docker-image/v1.16/debian-loggly/Gemfile | 2 +- docker-image/v1.16/debian-loggly/Gemfile.lock | 16 +++- .../v1.16/debian-loggly/hooks/post_push | 2 +- docker-image/v1.16/debian-logzio/Dockerfile | 2 +- docker-image/v1.16/debian-logzio/Gemfile | 2 +- docker-image/v1.16/debian-logzio/Gemfile.lock | 16 +++- .../v1.16/debian-logzio/hooks/post_push | 2 +- .../v1.16/debian-opensearch/Dockerfile | 2 +- docker-image/v1.16/debian-opensearch/Gemfile | 2 +- .../v1.16/debian-opensearch/Gemfile.lock | 22 ++++-- .../v1.16/debian-opensearch/hooks/post_push | 2 +- .../v1.16/debian-papertrail/Dockerfile | 2 +- docker-image/v1.16/debian-papertrail/Gemfile | 2 +- .../v1.16/debian-papertrail/Gemfile.lock | 16 +++- .../v1.16/debian-papertrail/hooks/post_push | 2 +- docker-image/v1.16/debian-s3/Dockerfile | 2 +- docker-image/v1.16/debian-s3/Gemfile | 2 +- docker-image/v1.16/debian-s3/Gemfile.lock | 24 ++++-- docker-image/v1.16/debian-s3/hooks/post_push | 2 +- docker-image/v1.16/debian-syslog/Dockerfile | 2 +- docker-image/v1.16/debian-syslog/Gemfile | 2 +- docker-image/v1.16/debian-syslog/Gemfile.lock | 16 +++- .../v1.16/debian-syslog/hooks/post_push | 2 +- 137 files changed, 607 insertions(+), 269 deletions(-) diff --git a/README.md b/README.md index 5da5698e2..57e4a86c7 100644 --- a/README.md +++ b/README.md @@ -25,130 +25,130 @@ If you want to use above non published images, build it by yourself. Dockerfile ##### Multi-Arch images - `Azureblob` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-2` - `Elasticsearch8` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-2` - `Elasticsearch7` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch` - `Opensearch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-2` - `Cloudwatch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-2` - `Forward` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-2` - `Gcs` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-2` - `Graylog` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-1.4` + - `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.5-debian-kafka-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-2` - `Kafka2` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-2` - `Kinesis` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-2` ##### x86_64 images - `Azureblob` [Dockerfile](docker-image/v1.16/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-amd64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-amd64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-amd64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-amd64` - `Opensearch` [Dockerfile](docker-image/v1.16/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-amd64-2` - `Loggly` [Dockerfile](docker-image/v1.16/debian-loggly/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-loggly-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-loggly-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-loggly-amd64-2` - `Logentries` [Dockerfile](docker-image/v1.16/debian-logentries/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logentries-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logentries-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-logentries-amd64-2` - `Cloudwatch` [Dockerfile](docker-image/v1.16/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-amd64-2` - `S3` [Dockerfile](docker-image/v1.16/debian-s3/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-s3-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-s3-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-s3-amd64-2` - `Syslog` [Dockerfile](docker-image/v1.16/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-amd64-2` - `Gcs` [Dockerfile](docker-image/v1.16/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-amd64-2` - `Graylog` [Dockerfile](docker-image/v1.16/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-amd64-2` - `Papertrail` [Dockerfile](docker-image/v1.16/debian-papertrail/Dockerfile) - `Logzio` [Dockerfile](docker-image/v1.16/debian-logzio/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logzio-amd64-1.4` + - `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.5-debian-kafka-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-amd64-1.0` - `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.5-debian-kafka2-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-amd64-1.0` - `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.5-debian-kinesis-amd64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-amd64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-amd64-2` ##### arm64 images - `Azureblob` [Dockerfile](docker-image/v1.16/arm64/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-arm64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-arm64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-arm64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-arm64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-arm64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-arm64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-arm64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-arm64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-arm64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-arm64` - `Opensearch` [Dockerfile](docker-image/v1.16/arm64/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-arm64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-arm64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-arm64-2` - `Loggly` [Dockerfile](docker-image/v1.16/arm64/debian-loggly/Dockerfile) - `Logentries` [Dockerfile](docker-image/v1.16/arm64/debian-logentries/Dockerfile) - `Cloudwatch` [Dockerfile](docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-arm64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-arm64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-arm64-2` - `S3` [Dockerfile](docker-image/v1.16/arm64/debian-s3/Dockerfile) - `Syslog` [Dockerfile](docker-image/v1.16/arm64/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/arm64/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-arm64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-arm64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-arm64-2` - `Gcs` [Dockerfile](docker-image/v1.16/arm64/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-arm64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-arm64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-arm64-2` - `Graylog` [Dockerfile](docker-image/v1.16/arm64/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-arm64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-arm64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-arm64-2` - `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.5-debian-kafka-arm64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-arm64-1.0` - `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.5-debian-kafka2-arm64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-arm64-1.0` - `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.5-debian-kinesis-arm64-1.4` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-arm64-1.0` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-arm64-2` diff --git a/docker-image/v1.16/arm64/debian-azureblob/Dockerfile b/docker-image/v1.16/arm64/debian-azureblob/Dockerfile index 832ab5388..d0a73fb41 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/Dockerfile +++ b/docker-image/v1.16/arm64/debian-azureblob/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-azureblob/Gemfile b/docker-image/v1.16/arm64/debian-azureblob/Gemfile index 196692210..c2216d5df 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/Gemfile +++ b/docker-image/v1.16/arm64/debian-azureblob/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock index 51c2c9f78..194601132 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock @@ -14,6 +14,10 @@ GEM base64 (0.2.0) concurrent-ruby (1.3.4) connection_pool (2.4.1) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) faraday (1.10.3) @@ -45,6 +49,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-azure-storage-append-blob-lts (0.7.0) @@ -78,8 +86,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -97,10 +106,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -172,7 +182,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push b/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push index ae37ae266..6b99397e9 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-azureblob/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.5-debian-azureblob-arm64-1.4,v1.16-debian-azureblob-arm64-2}; do +for tag in {v1.16.6-debian-azureblob-arm64-1.0,v1.16-debian-azureblob-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-cloudwatch/Dockerfile b/docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile index eca319341..d0f211534 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile +++ b/docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile index ab3e826ac..1396c03af 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile +++ b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock index e9252ec04..edb431ef3 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock @@ -4,25 +4,33 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.963.0) + aws-partitions (1.966.0) aws-sdk-cloudwatchlogs (1.88.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.201.4) + aws-sdk-core (3.201.5) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-cloudwatch-logs (0.14.3) @@ -56,8 +64,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -75,11 +84,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -142,7 +152,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push index 4fe8039b7..593f18688 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-cloudwatch/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.5-debian-cloudwatch-arm64-1.4,v1.16-debian-cloudwatch-arm64-2}; do +for tag in {v1.16.6-debian-cloudwatch-arm64-1.0,v1.16-debian-cloudwatch-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-elasticsearch7/Dockerfile b/docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile index eca319341..d0f211534 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile index f9331aed3..71c847225 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock index 8b3dca5b9..ce821d6ba 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock @@ -5,6 +5,10 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) elasticsearch (7.17.11) @@ -46,6 +50,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -83,8 +91,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -102,10 +111,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -172,7 +182,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push index 373597e3d..abd9e725c 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/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.5-debian-elasticsearch7-arm64-1.4,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; do +for tag in {v1.16.6-debian-elasticsearch7-arm64-1.0,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; 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-elasticsearch8/Dockerfile b/docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile index eca319341..d0f211534 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile index 6392d3650..1b79dd105 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock index 662dfeec9..c19977a40 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock @@ -5,6 +5,10 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) elastic-transport (8.3.5) @@ -28,6 +32,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -66,8 +74,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -85,10 +94,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -156,7 +166,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push index 61231945b..496dbd97f 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/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.5-debian-elasticsearch8-arm64-1.4,v1.16-debian-elasticsearch8-arm64-2}; do +for tag in {v1.16.6-debian-elasticsearch8-arm64-1.0,v1.16-debian-elasticsearch8-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-forward/Dockerfile b/docker-image/v1.16/arm64/debian-forward/Dockerfile index eca319341..d0f211534 100644 --- a/docker-image/v1.16/arm64/debian-forward/Dockerfile +++ b/docker-image/v1.16/arm64/debian-forward/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-forward/Gemfile b/docker-image/v1.16/arm64/debian-forward/Gemfile index a17ac8a1c..a9790b603 100644 --- a/docker-image/v1.16/arm64/debian-forward/Gemfile +++ b/docker-image/v1.16/arm64/debian-forward/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-forward/Gemfile.lock b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock index 9baa65215..fc1db9951 100644 --- a/docker-image/v1.16/arm64/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock @@ -5,12 +5,20 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -41,8 +49,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -60,10 +69,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -124,7 +134,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-forward/hooks/post_push b/docker-image/v1.16/arm64/debian-forward/hooks/post_push index 1ec36a054..690e9145b 100644 --- a/docker-image/v1.16/arm64/debian-forward/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-forward/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.5-debian-forward-arm64-1.4,v1.16-debian-forward-arm64-2}; do +for tag in {v1.16.6-debian-forward-arm64-1.0,v1.16-debian-forward-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-gcs/Dockerfile b/docker-image/v1.16/arm64/debian-gcs/Dockerfile index eca319341..d0f211534 100644 --- a/docker-image/v1.16/arm64/debian-gcs/Dockerfile +++ b/docker-image/v1.16/arm64/debian-gcs/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-gcs/Gemfile b/docker-image/v1.16/arm64/debian-gcs/Gemfile index eb877360f..511beec3b 100644 --- a/docker-image/v1.16/arm64/debian-gcs/Gemfile +++ b/docker-image/v1.16/arm64/debian-gcs/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock index f6570f381..8657842d6 100644 --- a/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock @@ -5,6 +5,10 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) declarative (0.0.20) digest-crc (0.6.5) @@ -19,6 +23,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -52,8 +60,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -74,7 +83,7 @@ GEM retriable (>= 2.0, < 4.a) google-apis-iamcredentials_v1 (0.21.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.42.0) + google-apis-storage_v1 (0.43.0) google-apis-core (>= 0.15.0, < 2.a) google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) @@ -105,11 +114,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) httpclient (2.8.3) + json (2.7.2) jsonpath (1.1.5) multi_json jwt (2.8.2) @@ -192,7 +202,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push b/docker-image/v1.16/arm64/debian-gcs/hooks/post_push index 659647362..1cf4542d8 100644 --- a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-gcs/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.5-debian-gcs-arm64-1.4,v1.16-debian-gcs-arm64-2}; do +for tag in {v1.16.6-debian-gcs-arm64-1.0,v1.16-debian-gcs-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-graylog/Dockerfile b/docker-image/v1.16/arm64/debian-graylog/Dockerfile index 2067cfe62..51f5ac578 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Dockerfile +++ b/docker-image/v1.16/arm64/debian-graylog/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-graylog/Gemfile b/docker-image/v1.16/arm64/debian-graylog/Gemfile index 6a34f1c26..96c9e4ae1 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Gemfile +++ b/docker-image/v1.16/arm64/debian-graylog/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock index 88dbfba93..8a30300e3 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock @@ -5,12 +5,20 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -44,8 +52,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -65,7 +74,7 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) @@ -131,7 +140,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) gelf oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push b/docker-image/v1.16/arm64/debian-graylog/hooks/post_push index e9ea61221..280d77506 100644 --- a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-graylog/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.5-debian-graylog-arm64-1.4,v1.16-debian-graylog-arm64-2}; do +for tag in {v1.16.6-debian-graylog-arm64-1.0,v1.16-debian-graylog-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-kafka/Dockerfile b/docker-image/v1.16/arm64/debian-kafka/Dockerfile index 26193740e..95386b18f 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Dockerfile +++ b/docker-image/v1.16/arm64/debian-kafka/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-kafka/Gemfile b/docker-image/v1.16/arm64/debian-kafka/Gemfile index dabdf9f88..f16710990 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Gemfile +++ b/docker-image/v1.16/arm64/debian-kafka/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock index 86fd2e905..a565401db 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock @@ -7,6 +7,10 @@ GEM multi_json (~> 1.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -15,6 +19,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-avro (1.1.1) @@ -55,8 +63,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -74,10 +83,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -150,7 +160,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rdkafka (~> 0.17.0) rexml (~> 3.2.5) 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 a6807b821..669f09bf0 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.5-debian-kafka-arm64-1.4,v1.16-debian-kafka-arm64-2}; do +for tag in {v1.16.6-debian-kafka-arm64-1.0,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 26193740e..95386b18f 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Dockerfile +++ b/docker-image/v1.16/arm64/debian-kafka2/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-kafka2/Gemfile b/docker-image/v1.16/arm64/debian-kafka2/Gemfile index dabdf9f88..f16710990 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Gemfile +++ b/docker-image/v1.16/arm64/debian-kafka2/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock index 86fd2e905..a565401db 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock @@ -7,6 +7,10 @@ GEM multi_json (~> 1.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -15,6 +19,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-avro (1.1.1) @@ -55,8 +63,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -74,10 +83,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -150,7 +160,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rdkafka (~> 0.17.0) rexml (~> 3.2.5) 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 dbc98e958..47172cfe3 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.5-debian-kafka2-arm64-1.4,v1.16-debian-kafka2-arm64-2}; do +for tag in {v1.16.6-debian-kafka2-arm64-1.0,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/arm64/debian-kinesis/Dockerfile b/docker-image/v1.16/arm64/debian-kinesis/Dockerfile index eca319341..d0f211534 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/Dockerfile +++ b/docker-image/v1.16/arm64/debian-kinesis/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-kinesis/Gemfile b/docker-image/v1.16/arm64/debian-kinesis/Gemfile index 11d3ee128..ccd637649 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/Gemfile +++ b/docker-image/v1.16/arm64/debian-kinesis/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock index 606c84201..e659494ad 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock @@ -4,11 +4,11 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.963.0) - aws-sdk-core (3.201.4) + aws-partitions (1.966.0) + aws-sdk-core (3.201.5) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) aws-sdk-firehose (1.76.0) aws-sdk-core (~> 3, >= 3.201.0) @@ -20,12 +20,20 @@ GEM aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -61,8 +69,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -81,11 +90,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -147,7 +157,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push b/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push index c0fc959d6..bc97995ec 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-kinesis/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.5-debian-kinesis-arm64-1.4,v1.16-debian-kinesis-arm64-2}; do +for tag in {v1.16.6-debian-kinesis-arm64-1.0,v1.16-debian-kinesis-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-logentries/Dockerfile b/docker-image/v1.16/arm64/debian-logentries/Dockerfile index eca319341..d0f211534 100644 --- a/docker-image/v1.16/arm64/debian-logentries/Dockerfile +++ b/docker-image/v1.16/arm64/debian-logentries/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-logentries/Gemfile b/docker-image/v1.16/arm64/debian-logentries/Gemfile index 5389fc7b3..7b74e1667 100644 --- a/docker-image/v1.16/arm64/debian-logentries/Gemfile +++ b/docker-image/v1.16/arm64/debian-logentries/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock index 9baa65215..fc1db9951 100644 --- a/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock @@ -5,12 +5,20 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -41,8 +49,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -60,10 +69,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -124,7 +134,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push b/docker-image/v1.16/arm64/debian-logentries/hooks/post_push index 45967041e..033534d92 100644 --- a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logentries/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.5-debian-logentries-arm64-1.4,v1.16-debian-logentries-arm64-2}; do +for tag in {v1.16.6-debian-logentries-arm64-1.0,v1.16-debian-logentries-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-loggly/Dockerfile b/docker-image/v1.16/arm64/debian-loggly/Dockerfile index eca319341..d0f211534 100644 --- a/docker-image/v1.16/arm64/debian-loggly/Dockerfile +++ b/docker-image/v1.16/arm64/debian-loggly/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-loggly/Gemfile b/docker-image/v1.16/arm64/debian-loggly/Gemfile index d56089d2c..1da0ba537 100644 --- a/docker-image/v1.16/arm64/debian-loggly/Gemfile +++ b/docker-image/v1.16/arm64/debian-loggly/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock index 0d062e027..bce07e4f2 100644 --- a/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock @@ -5,12 +5,20 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -44,8 +52,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -63,10 +72,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -129,7 +139,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push b/docker-image/v1.16/arm64/debian-loggly/hooks/post_push index 3f956b1b2..7abca7992 100644 --- a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-loggly/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.5-debian-loggly-arm64-1.4,v1.16-debian-loggly-arm64-2}; do +for tag in {v1.16.6-debian-loggly-arm64-1.0,v1.16-debian-loggly-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-logzio/Dockerfile b/docker-image/v1.16/arm64/debian-logzio/Dockerfile index eca319341..d0f211534 100644 --- a/docker-image/v1.16/arm64/debian-logzio/Dockerfile +++ b/docker-image/v1.16/arm64/debian-logzio/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-logzio/Gemfile b/docker-image/v1.16/arm64/debian-logzio/Gemfile index 7e433698c..b52087298 100644 --- a/docker-image/v1.16/arm64/debian-logzio/Gemfile +++ b/docker-image/v1.16/arm64/debian-logzio/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock index 3a525de0d..5a551d31e 100644 --- a/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock @@ -6,12 +6,20 @@ GEM base64 (0.2.0) concurrent-ruby (1.3.4) connection_pool (2.4.1) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -46,8 +54,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -65,10 +74,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -132,7 +142,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push b/docker-image/v1.16/arm64/debian-logzio/hooks/post_push index 8e8cbb1ba..674eccc39 100644 --- a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logzio/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.5-debian-logzio-arm64-1.4,v1.16-debian-logzio-arm64-2}; do +for tag in {v1.16.6-debian-logzio-arm64-1.0,v1.16-debian-logzio-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-opensearch/Dockerfile b/docker-image/v1.16/arm64/debian-opensearch/Dockerfile index eca319341..d0f211534 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/Dockerfile +++ b/docker-image/v1.16/arm64/debian-opensearch/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-opensearch/Gemfile b/docker-image/v1.16/arm64/debian-opensearch/Gemfile index e89392754..b8bc49ea8 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/Gemfile +++ b/docker-image/v1.16/arm64/debian-opensearch/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock index 5d23e95ad..81d381a96 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock @@ -4,16 +4,20 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.963.0) - aws-sdk-core (3.201.4) + aws-partitions (1.966.0) + aws-sdk-core (3.201.5) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) excon (0.111.0) @@ -32,6 +36,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -70,8 +78,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -89,11 +98,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -162,7 +172,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push b/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push index c7df3de9f..4b7184371 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-opensearch/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.5-debian-opensearch-arm64-1.4,v1.16-debian-opensearch-arm64-2}; do +for tag in {v1.16.6-debian-opensearch-arm64-1.0,v1.16-debian-opensearch-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-papertrail/Dockerfile b/docker-image/v1.16/arm64/debian-papertrail/Dockerfile index eca319341..d0f211534 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/Dockerfile +++ b/docker-image/v1.16/arm64/debian-papertrail/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-papertrail/Gemfile b/docker-image/v1.16/arm64/debian-papertrail/Gemfile index 8cc5619f1..e588626f5 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/Gemfile +++ b/docker-image/v1.16/arm64/debian-papertrail/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock index 6055d7405..083d9a978 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock @@ -5,12 +5,20 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-mixin-config-placeholders (0.4.0) @@ -47,8 +55,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -66,10 +75,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -132,7 +142,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push b/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push index a42ab8834..56d7892a7 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-papertrail/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.5-debian-papertrail-arm64-1.4,v1.16-debian-papertrail-arm64-2}; do +for tag in {v1.16.6-debian-papertrail-arm64-1.0,v1.16-debian-papertrail-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-s3/Dockerfile b/docker-image/v1.16/arm64/debian-s3/Dockerfile index b6e2ed13f..3920315ea 100644 --- a/docker-image/v1.16/arm64/debian-s3/Dockerfile +++ b/docker-image/v1.16/arm64/debian-s3/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-s3/Gemfile b/docker-image/v1.16/arm64/debian-s3/Gemfile index f05cb39ee..a2ed71ff7 100644 --- a/docker-image/v1.16/arm64/debian-s3/Gemfile +++ b/docker-image/v1.16/arm64/debian-s3/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-s3/Gemfile.lock b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock index 8d580dd19..d0e4a1581 100644 --- a/docker-image/v1.16/arm64/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock @@ -4,16 +4,16 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.963.0) - aws-sdk-core (3.201.4) + aws-partitions (1.966.0) + aws-sdk-core (3.201.5) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) aws-sdk-kms (1.88.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.157.0) + aws-sdk-s3 (1.158.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -24,12 +24,20 @@ GEM aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -64,8 +72,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -83,11 +92,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -150,7 +160,7 @@ DEPENDENCIES fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-s3 (~> 1.7.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-s3/hooks/post_push b/docker-image/v1.16/arm64/debian-s3/hooks/post_push index ed68719a9..e61c2d7fe 100644 --- a/docker-image/v1.16/arm64/debian-s3/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-s3/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.5-debian-s3-arm64-1.4,v1.16-debian-s3-arm64-2}; do +for tag in {v1.16.6-debian-s3-arm64-1.0,v1.16-debian-s3-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-syslog/Dockerfile b/docker-image/v1.16/arm64/debian-syslog/Dockerfile index eca319341..d0f211534 100644 --- a/docker-image/v1.16/arm64/debian-syslog/Dockerfile +++ b/docker-image/v1.16/arm64/debian-syslog/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM fluent/fluentd:v1.16.5-debian-arm64-1.0 +FROM fluent/fluentd:v1.16.6-debian-arm64-1.0 COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer="Eduardo Silva " diff --git a/docker-image/v1.16/arm64/debian-syslog/Gemfile b/docker-image/v1.16/arm64/debian-syslog/Gemfile index c60d0bf9e..735c9cab0 100644 --- a/docker-image/v1.16/arm64/debian-syslog/Gemfile +++ b/docker-image/v1.16/arm64/debian-syslog/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock index 6d5ac74a0..7d4372caf 100644 --- a/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock @@ -5,12 +5,20 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -44,8 +52,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -63,10 +72,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -131,7 +141,7 @@ DEPENDENCIES fluent-plugin-remote_syslog fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push b/docker-image/v1.16/arm64/debian-syslog/hooks/post_push index 7b5e48733..ba99fa253 100644 --- a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-syslog/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.5-debian-syslog-arm64-1.4,v1.16-debian-syslog-arm64-2}; do +for tag in {v1.16.6-debian-syslog-arm64-1.0,v1.16-debian-syslog-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-azureblob/Dockerfile b/docker-image/v1.16/debian-azureblob/Dockerfile index cb45afb22..8df056b45 100644 --- a/docker-image/v1.16/debian-azureblob/Dockerfile +++ b/docker-image/v1.16/debian-azureblob/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-azureblob/Gemfile b/docker-image/v1.16/debian-azureblob/Gemfile index 196692210..c2216d5df 100644 --- a/docker-image/v1.16/debian-azureblob/Gemfile +++ b/docker-image/v1.16/debian-azureblob/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-azureblob/Gemfile.lock b/docker-image/v1.16/debian-azureblob/Gemfile.lock index 51c2c9f78..194601132 100644 --- a/docker-image/v1.16/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/debian-azureblob/Gemfile.lock @@ -14,6 +14,10 @@ GEM base64 (0.2.0) concurrent-ruby (1.3.4) connection_pool (2.4.1) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) faraday (1.10.3) @@ -45,6 +49,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-azure-storage-append-blob-lts (0.7.0) @@ -78,8 +86,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -97,10 +106,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -172,7 +182,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-azureblob/hooks/post_push b/docker-image/v1.16/debian-azureblob/hooks/post_push index 73e2cc073..ca48d0ff4 100644 --- a/docker-image/v1.16/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/debian-azureblob/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.5-debian-azureblob-amd64-1.4,v1.16-debian-azureblob-amd64-2}; do +for tag in {v1.16.6-debian-azureblob-amd64-1.0,v1.16-debian-azureblob-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-cloudwatch/Dockerfile b/docker-image/v1.16/debian-cloudwatch/Dockerfile index 8fbb6325b..794b3d64d 100644 --- a/docker-image/v1.16/debian-cloudwatch/Dockerfile +++ b/docker-image/v1.16/debian-cloudwatch/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-cloudwatch/Gemfile b/docker-image/v1.16/debian-cloudwatch/Gemfile index ab3e826ac..1396c03af 100644 --- a/docker-image/v1.16/debian-cloudwatch/Gemfile +++ b/docker-image/v1.16/debian-cloudwatch/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-cloudwatch/Gemfile.lock b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock index e9252ec04..edb431ef3 100644 --- a/docker-image/v1.16/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock @@ -4,25 +4,33 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.963.0) + aws-partitions (1.966.0) aws-sdk-cloudwatchlogs (1.88.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.201.4) + aws-sdk-core (3.201.5) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-cloudwatch-logs (0.14.3) @@ -56,8 +64,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -75,11 +84,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -142,7 +152,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/debian-cloudwatch/hooks/post_push index c6d8c4320..d19afa2e3 100644 --- a/docker-image/v1.16/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/debian-cloudwatch/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.5-debian-cloudwatch-amd64-1.4,v1.16-debian-cloudwatch-amd64-2}; do +for tag in {v1.16.6-debian-cloudwatch-amd64-1.0,v1.16-debian-cloudwatch-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-elasticsearch7/Dockerfile b/docker-image/v1.16/debian-elasticsearch7/Dockerfile index 8fbb6325b..794b3d64d 100644 --- a/docker-image/v1.16/debian-elasticsearch7/Dockerfile +++ b/docker-image/v1.16/debian-elasticsearch7/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-elasticsearch7/Gemfile b/docker-image/v1.16/debian-elasticsearch7/Gemfile index f9331aed3..71c847225 100644 --- a/docker-image/v1.16/debian-elasticsearch7/Gemfile +++ b/docker-image/v1.16/debian-elasticsearch7/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock index 8b3dca5b9..ce821d6ba 100644 --- a/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock @@ -5,6 +5,10 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) elasticsearch (7.17.11) @@ -46,6 +50,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -83,8 +91,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -102,10 +111,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -172,7 +182,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/debian-elasticsearch7/hooks/post_push index 315cbdb43..0f5bab545 100644 --- a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch7/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.5-debian-elasticsearch7-amd64-1.4,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; do +for tag in {v1.16.6-debian-elasticsearch7-amd64-1.0,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; 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-elasticsearch8/Dockerfile b/docker-image/v1.16/debian-elasticsearch8/Dockerfile index 8fbb6325b..794b3d64d 100644 --- a/docker-image/v1.16/debian-elasticsearch8/Dockerfile +++ b/docker-image/v1.16/debian-elasticsearch8/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-elasticsearch8/Gemfile b/docker-image/v1.16/debian-elasticsearch8/Gemfile index 6392d3650..1b79dd105 100644 --- a/docker-image/v1.16/debian-elasticsearch8/Gemfile +++ b/docker-image/v1.16/debian-elasticsearch8/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock index 662dfeec9..c19977a40 100644 --- a/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock @@ -5,6 +5,10 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) elastic-transport (8.3.5) @@ -28,6 +32,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -66,8 +74,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -85,10 +94,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -156,7 +166,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/debian-elasticsearch8/hooks/post_push index 8c0d72f83..d41923813 100644 --- a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch8/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.5-debian-elasticsearch8-amd64-1.4,v1.16-debian-elasticsearch8-amd64-2}; do +for tag in {v1.16.6-debian-elasticsearch8-amd64-1.0,v1.16-debian-elasticsearch8-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-forward/Dockerfile b/docker-image/v1.16/debian-forward/Dockerfile index 8fbb6325b..794b3d64d 100644 --- a/docker-image/v1.16/debian-forward/Dockerfile +++ b/docker-image/v1.16/debian-forward/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-forward/Gemfile b/docker-image/v1.16/debian-forward/Gemfile index a17ac8a1c..a9790b603 100644 --- a/docker-image/v1.16/debian-forward/Gemfile +++ b/docker-image/v1.16/debian-forward/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-forward/Gemfile.lock b/docker-image/v1.16/debian-forward/Gemfile.lock index 9baa65215..fc1db9951 100644 --- a/docker-image/v1.16/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/debian-forward/Gemfile.lock @@ -5,12 +5,20 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -41,8 +49,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -60,10 +69,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -124,7 +134,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-forward/hooks/post_push b/docker-image/v1.16/debian-forward/hooks/post_push index e66f13e35..61f21b977 100644 --- a/docker-image/v1.16/debian-forward/hooks/post_push +++ b/docker-image/v1.16/debian-forward/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.5-debian-forward-amd64-1.4,v1.16-debian-forward-amd64-2}; do +for tag in {v1.16.6-debian-forward-amd64-1.0,v1.16-debian-forward-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-gcs/Dockerfile b/docker-image/v1.16/debian-gcs/Dockerfile index 8fbb6325b..794b3d64d 100644 --- a/docker-image/v1.16/debian-gcs/Dockerfile +++ b/docker-image/v1.16/debian-gcs/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-gcs/Gemfile b/docker-image/v1.16/debian-gcs/Gemfile index eb877360f..511beec3b 100644 --- a/docker-image/v1.16/debian-gcs/Gemfile +++ b/docker-image/v1.16/debian-gcs/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-gcs/Gemfile.lock b/docker-image/v1.16/debian-gcs/Gemfile.lock index f6570f381..8657842d6 100644 --- a/docker-image/v1.16/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/debian-gcs/Gemfile.lock @@ -5,6 +5,10 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) declarative (0.0.20) digest-crc (0.6.5) @@ -19,6 +23,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -52,8 +60,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -74,7 +83,7 @@ GEM retriable (>= 2.0, < 4.a) google-apis-iamcredentials_v1 (0.21.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.42.0) + google-apis-storage_v1 (0.43.0) google-apis-core (>= 0.15.0, < 2.a) google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) @@ -105,11 +114,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) httpclient (2.8.3) + json (2.7.2) jsonpath (1.1.5) multi_json jwt (2.8.2) @@ -192,7 +202,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-gcs/hooks/post_push b/docker-image/v1.16/debian-gcs/hooks/post_push index d487dc1b2..22dcb1108 100644 --- a/docker-image/v1.16/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/debian-gcs/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.5-debian-gcs-amd64-1.4,v1.16-debian-gcs-amd64-2}; do +for tag in {v1.16.6-debian-gcs-amd64-1.0,v1.16-debian-gcs-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-graylog/Dockerfile b/docker-image/v1.16/debian-graylog/Dockerfile index 5fcb457b6..d582d59bf 100644 --- a/docker-image/v1.16/debian-graylog/Dockerfile +++ b/docker-image/v1.16/debian-graylog/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-graylog/Gemfile b/docker-image/v1.16/debian-graylog/Gemfile index 6a34f1c26..96c9e4ae1 100644 --- a/docker-image/v1.16/debian-graylog/Gemfile +++ b/docker-image/v1.16/debian-graylog/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-graylog/Gemfile.lock b/docker-image/v1.16/debian-graylog/Gemfile.lock index 88dbfba93..8a30300e3 100644 --- a/docker-image/v1.16/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/debian-graylog/Gemfile.lock @@ -5,12 +5,20 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -44,8 +52,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -65,7 +74,7 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) @@ -131,7 +140,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) gelf oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-graylog/hooks/post_push b/docker-image/v1.16/debian-graylog/hooks/post_push index 7c305c242..b44858033 100644 --- a/docker-image/v1.16/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/debian-graylog/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.5-debian-graylog-amd64-1.4,v1.16-debian-graylog-amd64-2}; do +for tag in {v1.16.6-debian-graylog-amd64-1.0,v1.16-debian-graylog-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-kafka/Dockerfile b/docker-image/v1.16/debian-kafka/Dockerfile index 0d37b2760..83f1b8d15 100644 --- a/docker-image/v1.16/debian-kafka/Dockerfile +++ b/docker-image/v1.16/debian-kafka/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-kafka/Gemfile b/docker-image/v1.16/debian-kafka/Gemfile index dabdf9f88..f16710990 100644 --- a/docker-image/v1.16/debian-kafka/Gemfile +++ b/docker-image/v1.16/debian-kafka/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-kafka/Gemfile.lock b/docker-image/v1.16/debian-kafka/Gemfile.lock index 86fd2e905..a565401db 100644 --- a/docker-image/v1.16/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka/Gemfile.lock @@ -7,6 +7,10 @@ GEM multi_json (~> 1.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -15,6 +19,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-avro (1.1.1) @@ -55,8 +63,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -74,10 +83,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -150,7 +160,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rdkafka (~> 0.17.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-kafka/hooks/post_push b/docker-image/v1.16/debian-kafka/hooks/post_push index 7ef9edc65..321dbab32 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.5-debian-kafka-amd64-1.4,v1.16-debian-kafka-amd64-2}; do +for tag in {v1.16.6-debian-kafka-amd64-1.0,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 0d37b2760..83f1b8d15 100644 --- a/docker-image/v1.16/debian-kafka2/Dockerfile +++ b/docker-image/v1.16/debian-kafka2/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-kafka2/Gemfile b/docker-image/v1.16/debian-kafka2/Gemfile index dabdf9f88..f16710990 100644 --- a/docker-image/v1.16/debian-kafka2/Gemfile +++ b/docker-image/v1.16/debian-kafka2/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-kafka2/Gemfile.lock b/docker-image/v1.16/debian-kafka2/Gemfile.lock index 86fd2e905..a565401db 100644 --- a/docker-image/v1.16/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka2/Gemfile.lock @@ -7,6 +7,10 @@ GEM multi_json (~> 1.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -15,6 +19,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-avro (1.1.1) @@ -55,8 +63,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -74,10 +83,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -150,7 +160,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rdkafka (~> 0.17.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-kafka2/hooks/post_push b/docker-image/v1.16/debian-kafka2/hooks/post_push index 9682b3ecd..64d726572 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.5-debian-kafka2-amd64-1.4,v1.16-debian-kafka2-amd64-2}; do +for tag in {v1.16.6-debian-kafka2-amd64-1.0,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 diff --git a/docker-image/v1.16/debian-kinesis/Dockerfile b/docker-image/v1.16/debian-kinesis/Dockerfile index 8fbb6325b..794b3d64d 100644 --- a/docker-image/v1.16/debian-kinesis/Dockerfile +++ b/docker-image/v1.16/debian-kinesis/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-kinesis/Gemfile b/docker-image/v1.16/debian-kinesis/Gemfile index 11d3ee128..ccd637649 100644 --- a/docker-image/v1.16/debian-kinesis/Gemfile +++ b/docker-image/v1.16/debian-kinesis/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-kinesis/Gemfile.lock b/docker-image/v1.16/debian-kinesis/Gemfile.lock index 606c84201..e659494ad 100644 --- a/docker-image/v1.16/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/debian-kinesis/Gemfile.lock @@ -4,11 +4,11 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.963.0) - aws-sdk-core (3.201.4) + aws-partitions (1.966.0) + aws-sdk-core (3.201.5) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) aws-sdk-firehose (1.76.0) aws-sdk-core (~> 3, >= 3.201.0) @@ -20,12 +20,20 @@ GEM aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -61,8 +69,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -81,11 +90,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -147,7 +157,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-kinesis/hooks/post_push b/docker-image/v1.16/debian-kinesis/hooks/post_push index 0e4a78194..f29c1b18f 100644 --- a/docker-image/v1.16/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/debian-kinesis/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.5-debian-kinesis-amd64-1.4,v1.16-debian-kinesis-amd64-2}; do +for tag in {v1.16.6-debian-kinesis-amd64-1.0,v1.16-debian-kinesis-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-logentries/Dockerfile b/docker-image/v1.16/debian-logentries/Dockerfile index 8fbb6325b..794b3d64d 100644 --- a/docker-image/v1.16/debian-logentries/Dockerfile +++ b/docker-image/v1.16/debian-logentries/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-logentries/Gemfile b/docker-image/v1.16/debian-logentries/Gemfile index 5389fc7b3..7b74e1667 100644 --- a/docker-image/v1.16/debian-logentries/Gemfile +++ b/docker-image/v1.16/debian-logentries/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-logentries/Gemfile.lock b/docker-image/v1.16/debian-logentries/Gemfile.lock index 9baa65215..fc1db9951 100644 --- a/docker-image/v1.16/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/debian-logentries/Gemfile.lock @@ -5,12 +5,20 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -41,8 +49,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -60,10 +69,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -124,7 +134,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-logentries/hooks/post_push b/docker-image/v1.16/debian-logentries/hooks/post_push index 6c96c03b6..6f7429f7a 100644 --- a/docker-image/v1.16/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/debian-logentries/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.5-debian-logentries-amd64-1.4,v1.16-debian-logentries-amd64-2}; do +for tag in {v1.16.6-debian-logentries-amd64-1.0,v1.16-debian-logentries-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-loggly/Dockerfile b/docker-image/v1.16/debian-loggly/Dockerfile index 8fbb6325b..794b3d64d 100644 --- a/docker-image/v1.16/debian-loggly/Dockerfile +++ b/docker-image/v1.16/debian-loggly/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-loggly/Gemfile b/docker-image/v1.16/debian-loggly/Gemfile index d56089d2c..1da0ba537 100644 --- a/docker-image/v1.16/debian-loggly/Gemfile +++ b/docker-image/v1.16/debian-loggly/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-loggly/Gemfile.lock b/docker-image/v1.16/debian-loggly/Gemfile.lock index 0d062e027..bce07e4f2 100644 --- a/docker-image/v1.16/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/debian-loggly/Gemfile.lock @@ -5,12 +5,20 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -44,8 +52,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -63,10 +72,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -129,7 +139,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-loggly/hooks/post_push b/docker-image/v1.16/debian-loggly/hooks/post_push index 8a2f9b64a..cf958e8b8 100644 --- a/docker-image/v1.16/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/debian-loggly/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.5-debian-loggly-amd64-1.4,v1.16-debian-loggly-amd64-2}; do +for tag in {v1.16.6-debian-loggly-amd64-1.0,v1.16-debian-loggly-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-logzio/Dockerfile b/docker-image/v1.16/debian-logzio/Dockerfile index 8fbb6325b..794b3d64d 100644 --- a/docker-image/v1.16/debian-logzio/Dockerfile +++ b/docker-image/v1.16/debian-logzio/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-logzio/Gemfile b/docker-image/v1.16/debian-logzio/Gemfile index 7e433698c..b52087298 100644 --- a/docker-image/v1.16/debian-logzio/Gemfile +++ b/docker-image/v1.16/debian-logzio/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-logzio/Gemfile.lock b/docker-image/v1.16/debian-logzio/Gemfile.lock index 3a525de0d..5a551d31e 100644 --- a/docker-image/v1.16/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/debian-logzio/Gemfile.lock @@ -6,12 +6,20 @@ GEM base64 (0.2.0) concurrent-ruby (1.3.4) connection_pool (2.4.1) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -46,8 +54,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -65,10 +74,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -132,7 +142,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-logzio/hooks/post_push b/docker-image/v1.16/debian-logzio/hooks/post_push index 998a056d3..2c9648172 100644 --- a/docker-image/v1.16/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/debian-logzio/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.5-debian-logzio-amd64-1.4,v1.16-debian-logzio-amd64-2}; do +for tag in {v1.16.6-debian-logzio-amd64-1.0,v1.16-debian-logzio-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-opensearch/Dockerfile b/docker-image/v1.16/debian-opensearch/Dockerfile index 8fbb6325b..794b3d64d 100644 --- a/docker-image/v1.16/debian-opensearch/Dockerfile +++ b/docker-image/v1.16/debian-opensearch/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-opensearch/Gemfile b/docker-image/v1.16/debian-opensearch/Gemfile index e89392754..b8bc49ea8 100644 --- a/docker-image/v1.16/debian-opensearch/Gemfile +++ b/docker-image/v1.16/debian-opensearch/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-opensearch/Gemfile.lock b/docker-image/v1.16/debian-opensearch/Gemfile.lock index 5d23e95ad..81d381a96 100644 --- a/docker-image/v1.16/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/debian-opensearch/Gemfile.lock @@ -4,16 +4,20 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.963.0) - aws-sdk-core (3.201.4) + aws-partitions (1.966.0) + aws-sdk-core (3.201.5) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) excon (0.111.0) @@ -32,6 +36,10 @@ GEM ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -70,8 +78,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -89,11 +98,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -162,7 +172,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-opensearch/hooks/post_push b/docker-image/v1.16/debian-opensearch/hooks/post_push index dddf74578..f855e312f 100644 --- a/docker-image/v1.16/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/debian-opensearch/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.5-debian-opensearch-amd64-1.4,v1.16-debian-opensearch-amd64-2}; do +for tag in {v1.16.6-debian-opensearch-amd64-1.0,v1.16-debian-opensearch-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-papertrail/Dockerfile b/docker-image/v1.16/debian-papertrail/Dockerfile index 8fbb6325b..794b3d64d 100644 --- a/docker-image/v1.16/debian-papertrail/Dockerfile +++ b/docker-image/v1.16/debian-papertrail/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-papertrail/Gemfile b/docker-image/v1.16/debian-papertrail/Gemfile index 8cc5619f1..e588626f5 100644 --- a/docker-image/v1.16/debian-papertrail/Gemfile +++ b/docker-image/v1.16/debian-papertrail/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-papertrail/Gemfile.lock b/docker-image/v1.16/debian-papertrail/Gemfile.lock index 6055d7405..083d9a978 100644 --- a/docker-image/v1.16/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/debian-papertrail/Gemfile.lock @@ -5,12 +5,20 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-mixin-config-placeholders (0.4.0) @@ -47,8 +55,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -66,10 +75,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -132,7 +142,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-papertrail/hooks/post_push b/docker-image/v1.16/debian-papertrail/hooks/post_push index ec1c73259..55e10c526 100644 --- a/docker-image/v1.16/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/debian-papertrail/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.5-debian-papertrail-amd64-1.4,v1.16-debian-papertrail-amd64-2}; do +for tag in {v1.16.6-debian-papertrail-amd64-1.0,v1.16-debian-papertrail-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-s3/Dockerfile b/docker-image/v1.16/debian-s3/Dockerfile index 57ea9f64e..0adcab932 100644 --- a/docker-image/v1.16/debian-s3/Dockerfile +++ b/docker-image/v1.16/debian-s3/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-s3/Gemfile b/docker-image/v1.16/debian-s3/Gemfile index f05cb39ee..a2ed71ff7 100644 --- a/docker-image/v1.16/debian-s3/Gemfile +++ b/docker-image/v1.16/debian-s3/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-s3/Gemfile.lock b/docker-image/v1.16/debian-s3/Gemfile.lock index 8d580dd19..d0e4a1581 100644 --- a/docker-image/v1.16/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/debian-s3/Gemfile.lock @@ -4,16 +4,16 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.963.0) - aws-sdk-core (3.201.4) + aws-partitions (1.966.0) + aws-sdk-core (3.201.5) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) aws-sdk-kms (1.88.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.157.0) + aws-sdk-s3 (1.158.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -24,12 +24,20 @@ GEM aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -64,8 +72,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -83,11 +92,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -150,7 +160,7 @@ DEPENDENCIES fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-s3 (~> 1.7.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-s3/hooks/post_push b/docker-image/v1.16/debian-s3/hooks/post_push index 74383e515..d5c4bc7c9 100644 --- a/docker-image/v1.16/debian-s3/hooks/post_push +++ b/docker-image/v1.16/debian-s3/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.5-debian-s3-amd64-1.4,v1.16-debian-s3-amd64-2}; do +for tag in {v1.16.6-debian-s3-amd64-1.0,v1.16-debian-s3-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-syslog/Dockerfile b/docker-image/v1.16/debian-syslog/Dockerfile index 8fbb6325b..794b3d64d 100644 --- a/docker-image/v1.16/debian-syslog/Dockerfile +++ b/docker-image/v1.16/debian-syslog/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb -FROM fluent/fluentd:v1.16.5-debian-amd64-1.0 +FROM fluent/fluentd:v1.16.6-debian-amd64-1.0 LABEL maintainer="Eduardo Silva " USER root diff --git a/docker-image/v1.16/debian-syslog/Gemfile b/docker-image/v1.16/debian-syslog/Gemfile index c60d0bf9e..735c9cab0 100644 --- a/docker-image/v1.16/debian-syslog/Gemfile +++ b/docker-image/v1.16/debian-syslog/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" -gem "fluentd", "1.16.5" +gem "fluentd", "1.16.6" gem "oj", "~> 3.15.0" gem "rexml", "~> 3.2.5" gem "fluent-plugin-multi-format-parser", "~> 1.0.0" diff --git a/docker-image/v1.16/debian-syslog/Gemfile.lock b/docker-image/v1.16/debian-syslog/Gemfile.lock index 6d5ac74a0..7d4372caf 100644 --- a/docker-image/v1.16/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/debian-syslog/Gemfile.lock @@ -5,12 +5,20 @@ GEM public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) concurrent-ruby (1.3.4) + console (1.23.7) + fiber-annotation + fiber-local + json cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) @@ -44,8 +52,9 @@ GEM fluent-plugin-systemd (1.0.5) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.4.2) - fluentd (1.16.5) + fluentd (1.16.6) bundler + console (< 1.24) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) @@ -63,10 +72,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) + json (2.7.2) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -131,7 +141,7 @@ DEPENDENCIES fluent-plugin-remote_syslog fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-systemd (~> 1.0.5) - fluentd (= 1.16.5) + fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-syslog/hooks/post_push b/docker-image/v1.16/debian-syslog/hooks/post_push index 6ad2898bb..9e84462c5 100644 --- a/docker-image/v1.16/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/debian-syslog/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.5-debian-syslog-amd64-1.4,v1.16-debian-syslog-amd64-2}; do +for tag in {v1.16.6-debian-syslog-amd64-1.0,v1.16-debian-syslog-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 From 77fd9d883f41970ea7d2e68ff0c214c2f744160b Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Thu, 22 Aug 2024 15:15:15 +0900 Subject: [PATCH 18/26] 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 19/26] 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 From 5b572715d55a1100f13b66ceec89b953c2774e2c Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Thu, 22 Aug 2024 16:30:32 +0900 Subject: [PATCH 20/26] Backport: align matching component order Before: Even though tagged debian-kafka2, it matched *debian-kafka* pattern. After: Even though tagged debian-kafka2, it matched *debian-kafka2* correctly. Signed-off-by: Kentaro Hayashi --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 212f73c8b..9f84fd484 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -20,8 +20,8 @@ jobs: "debian-forward", "debian-gcs", "debian-graylog", - "debian-kafka", "debian-kafka2", + "debian-kafka", "debian-kinesis", "debian-logentries", "debian-loggly", From e3e94f4da5e7351950f78a94ca3de5dc7012ae40 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 11 Sep 2024 16:32:58 +0900 Subject: [PATCH 21/26] Use latest fluent-plugin-systemd systemd-journal 2.0.0 fixes segmentation fault with jemalloc memory allocator. fluent-plugin-systemd 1.1.0 adopts systemd-journal 2.0.0 or later. https://github.com/fluent/fluentd-docker-image/issues/378 https://github.com/fluent/fluentd-docker-image/issues/385 https://github.com/fluent/fluentd-kubernetes-daemonset/issues/1517 Signed-off-by: Kentaro Hayashi --- templates/Gemfile.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Gemfile.erb b/templates/Gemfile.erb index a32a6d168..4cd83c623 100644 --- a/templates/Gemfile.erb +++ b/templates/Gemfile.erb @@ -67,5 +67,5 @@ gem "fluent-plugin-splunk-enterprise" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" <% if !is_alpine %> gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" <% end %> From 616bd8a2d5abbc84b10caa402ae35bd67748ada6 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 11 Sep 2024 16:35:06 +0900 Subject: [PATCH 22/26] Bump version to v1.16.6-1.2 As already v1.16.6-1.1 was shipped for kafka,kafka2 images in advance, bump up version to -1.2. Signed-off-by: Kentaro Hayashi --- Makefile | 68 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 3fe8d576c..4c456c7fb 100644 --- a/Makefile +++ b/Makefile @@ -12,44 +12,44 @@ IMAGE_NAME := fluent/fluentd-kubernetes X86_IMAGES := \ - v1.16/debian-azureblob:v1.16.6-debian-azureblob-amd64-1.0,v1.16-debian-azureblob-amd64-2 \ - v1.16/debian-elasticsearch8:v1.16.6-debian-elasticsearch8-amd64-1.0,v1.16-debian-elasticsearch8-amd64-2 \ - v1.16/debian-elasticsearch7:v1.16.6-debian-elasticsearch7-amd64-1.0,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ - v1.16/debian-opensearch:v1.16.6-debian-opensearch-amd64-1.0,v1.16-debian-opensearch-amd64-2 \ - v1.16/debian-loggly:v1.16.6-debian-loggly-amd64-1.0,v1.16-debian-loggly-amd64-2 \ - v1.16/debian-logentries:v1.16.6-debian-logentries-amd64-1.0,v1.16-debian-logentries-amd64-2 \ - v1.16/debian-cloudwatch:v1.16.6-debian-cloudwatch-amd64-1.0,v1.16-debian-cloudwatch-amd64-2 \ - v1.16/debian-s3:v1.16.6-debian-s3-amd64-1.0,v1.16-debian-s3-amd64-2 \ - v1.16/debian-syslog:v1.16.6-debian-syslog-amd64-1.0,v1.16-debian-syslog-amd64-2 \ - v1.16/debian-forward:v1.16.6-debian-forward-amd64-1.0,v1.16-debian-forward-amd64-2 \ - v1.16/debian-gcs:v1.16.6-debian-gcs-amd64-1.0,v1.16-debian-gcs-amd64-2 \ - 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.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 + v1.16/debian-azureblob:v1.16.6-debian-azureblob-amd64-1.2,v1.16-debian-azureblob-amd64-2 \ + v1.16/debian-elasticsearch8:v1.16.6-debian-elasticsearch8-amd64-1.2,v1.16-debian-elasticsearch8-amd64-2 \ + v1.16/debian-elasticsearch7:v1.16.6-debian-elasticsearch7-amd64-1.2,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ + v1.16/debian-opensearch:v1.16.6-debian-opensearch-amd64-1.2,v1.16-debian-opensearch-amd64-2 \ + v1.16/debian-loggly:v1.16.6-debian-loggly-amd64-1.2,v1.16-debian-loggly-amd64-2 \ + v1.16/debian-logentries:v1.16.6-debian-logentries-amd64-1.2,v1.16-debian-logentries-amd64-2 \ + v1.16/debian-cloudwatch:v1.16.6-debian-cloudwatch-amd64-1.2,v1.16-debian-cloudwatch-amd64-2 \ + v1.16/debian-s3:v1.16.6-debian-s3-amd64-1.2,v1.16-debian-s3-amd64-2 \ + v1.16/debian-syslog:v1.16.6-debian-syslog-amd64-1.2,v1.16-debian-syslog-amd64-2 \ + v1.16/debian-forward:v1.16.6-debian-forward-amd64-1.2,v1.16-debian-forward-amd64-2 \ + v1.16/debian-gcs:v1.16.6-debian-gcs-amd64-1.2,v1.16-debian-gcs-amd64-2 \ + v1.16/debian-graylog:v1.16.6-debian-graylog-amd64-1.2,v1.16-debian-graylog-amd64-2 \ + v1.16/debian-papertrail:v1.16.6-debian-papertrail-amd64-1.2,v1.16-debian-papertrail-amd64-2 \ + v1.16/debian-logzio:v1.16.6-debian-logzio-amd64-1.2,v1.16-debian-logzio-amd64-2 \ + v1.16/debian-kafka:v1.16.6-debian-kafka-amd64-1.2,v1.16-debian-kafka-amd64-2 \ + v1.16/debian-kafka2:v1.16.6-debian-kafka2-amd64-1.2,v1.16-debian-kafka2-amd64-2 \ + v1.16/debian-kinesis:v1.16.6-debian-kinesis-amd64-1.2,v1.16-debian-kinesis-amd64-2 # :,,,... ARM64_IMAGES := \ - v1.16/arm64/debian-azureblob:v1.16.6-debian-azureblob-arm64-1.0,v1.16-debian-azureblob-arm64-2 \ - v1.16/arm64/debian-elasticsearch8:v1.16.6-debian-elasticsearch8-arm64-1.0,v1.16-debian-elasticsearch8-arm64-2 \ - v1.16/arm64/debian-elasticsearch7:v1.16.6-debian-elasticsearch7-arm64-1.0,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ - v1.16/arm64/debian-opensearch:v1.16.6-debian-opensearch-arm64-1.0,v1.16-debian-opensearch-arm64-2 \ - v1.16/arm64/debian-loggly:v1.16.6-debian-loggly-arm64-1.0,v1.16-debian-loggly-arm64-2 \ - v1.16/arm64/debian-logentries:v1.16.6-debian-logentries-arm64-1.0,v1.16-debian-logentries-arm64-2 \ - v1.16/arm64/debian-cloudwatch:v1.16.6-debian-cloudwatch-arm64-1.0,v1.16-debian-cloudwatch-arm64-2 \ - v1.16/arm64/debian-s3:v1.16.6-debian-s3-arm64-1.0,v1.16-debian-s3-arm64-2 \ - v1.16/arm64/debian-syslog:v1.16.6-debian-syslog-arm64-1.0,v1.16-debian-syslog-arm64-2 \ - v1.16/arm64/debian-forward:v1.16.6-debian-forward-arm64-1.0,v1.16-debian-forward-arm64-2 \ - v1.16/arm64/debian-gcs:v1.16.6-debian-gcs-arm64-1.0,v1.16-debian-gcs-arm64-2 \ - 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.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 + v1.16/arm64/debian-azureblob:v1.16.6-debian-azureblob-arm64-1.2,v1.16-debian-azureblob-arm64-2 \ + v1.16/arm64/debian-elasticsearch8:v1.16.6-debian-elasticsearch8-arm64-1.2,v1.16-debian-elasticsearch8-arm64-2 \ + v1.16/arm64/debian-elasticsearch7:v1.16.6-debian-elasticsearch7-arm64-1.2,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ + v1.16/arm64/debian-opensearch:v1.16.6-debian-opensearch-arm64-1.2,v1.16-debian-opensearch-arm64-2 \ + v1.16/arm64/debian-loggly:v1.16.6-debian-loggly-arm64-1.2,v1.16-debian-loggly-arm64-2 \ + v1.16/arm64/debian-logentries:v1.16.6-debian-logentries-arm64-1.2,v1.16-debian-logentries-arm64-2 \ + v1.16/arm64/debian-cloudwatch:v1.16.6-debian-cloudwatch-arm64-1.2,v1.16-debian-cloudwatch-arm64-2 \ + v1.16/arm64/debian-s3:v1.16.6-debian-s3-arm64-1.2,v1.16-debian-s3-arm64-2 \ + v1.16/arm64/debian-syslog:v1.16.6-debian-syslog-arm64-1.2,v1.16-debian-syslog-arm64-2 \ + v1.16/arm64/debian-forward:v1.16.6-debian-forward-arm64-1.2,v1.16-debian-forward-arm64-2 \ + v1.16/arm64/debian-gcs:v1.16.6-debian-gcs-arm64-1.2,v1.16-debian-gcs-arm64-2 \ + v1.16/arm64/debian-graylog:v1.16.6-debian-graylog-arm64-1.2,v1.16-debian-graylog-arm64-2 \ + v1.16/arm64/debian-papertrail:v1.16.6-debian-papertrail-arm64-1.2,v1.16-debian-papertrail-arm64-2 \ + v1.16/arm64/debian-logzio:v1.16.6-debian-logzio-arm64-1.2,v1.16-debian-logzio-arm64-2 \ + v1.16/arm64/debian-kafka:v1.16.6-debian-kafka-arm64-1.2,v1.16-debian-kafka-arm64-2 \ + v1.16/arm64/debian-kafka2:v1.16.6-debian-kafka2-arm64-1.2,v1.16-debian-kafka2-arm64-2 \ + v1.16/arm64/debian-kinesis:v1.16.6-debian-kinesis-arm64-1.2,v1.16-debian-kinesis-arm64-2 ALL_IMAGES := $(X86_IMAGES) $(ARM64_IMAGES) From 3140e88888918336405017e0a6f31500829f2468 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 11 Sep 2024 16:43:21 +0900 Subject: [PATCH 23/26] Add v1.16.6-1.2 images Signed-off-by: Kentaro Hayashi --- README.md | 74 +++++++++---------- .../v1.16/arm64/debian-azureblob/Gemfile | 2 +- .../v1.16/arm64/debian-azureblob/Gemfile.lock | 14 ++-- .../arm64/debian-azureblob/hooks/post_push | 2 +- .../v1.16/arm64/debian-cloudwatch/Gemfile | 2 +- .../arm64/debian-cloudwatch/Gemfile.lock | 20 ++--- .../arm64/debian-cloudwatch/hooks/post_push | 2 +- .../v1.16/arm64/debian-elasticsearch7/Gemfile | 2 +- .../arm64/debian-elasticsearch7/Gemfile.lock | 12 +-- .../debian-elasticsearch7/hooks/post_push | 2 +- .../v1.16/arm64/debian-elasticsearch8/Gemfile | 2 +- .../arm64/debian-elasticsearch8/Gemfile.lock | 22 +++--- .../debian-elasticsearch8/hooks/post_push | 2 +- .../v1.16/arm64/debian-forward/Gemfile | 2 +- .../v1.16/arm64/debian-forward/Gemfile.lock | 12 +-- .../arm64/debian-forward/hooks/post_push | 2 +- docker-image/v1.16/arm64/debian-gcs/Gemfile | 2 +- .../v1.16/arm64/debian-gcs/Gemfile.lock | 26 +++---- .../v1.16/arm64/debian-gcs/hooks/post_push | 2 +- .../v1.16/arm64/debian-graylog/Gemfile | 2 +- .../v1.16/arm64/debian-graylog/Gemfile.lock | 12 +-- .../arm64/debian-graylog/hooks/post_push | 2 +- docker-image/v1.16/arm64/debian-kafka/Gemfile | 2 +- .../v1.16/arm64/debian-kafka/Gemfile.lock | 12 +-- .../v1.16/arm64/debian-kafka/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka2/Gemfile | 2 +- .../v1.16/arm64/debian-kafka2/Gemfile.lock | 12 +-- .../v1.16/arm64/debian-kafka2/hooks/post_push | 2 +- .../v1.16/arm64/debian-kinesis/Gemfile | 2 +- .../v1.16/arm64/debian-kinesis/Gemfile.lock | 24 +++--- .../arm64/debian-kinesis/hooks/post_push | 2 +- .../v1.16/arm64/debian-logentries/Gemfile | 2 +- .../arm64/debian-logentries/Gemfile.lock | 12 +-- .../arm64/debian-logentries/hooks/post_push | 2 +- .../v1.16/arm64/debian-loggly/Gemfile | 2 +- .../v1.16/arm64/debian-loggly/Gemfile.lock | 12 +-- .../v1.16/arm64/debian-loggly/hooks/post_push | 2 +- .../v1.16/arm64/debian-logzio/Gemfile | 2 +- .../v1.16/arm64/debian-logzio/Gemfile.lock | 14 ++-- .../v1.16/arm64/debian-logzio/hooks/post_push | 2 +- .../v1.16/arm64/debian-opensearch/Gemfile | 2 +- .../arm64/debian-opensearch/Gemfile.lock | 26 +++---- .../arm64/debian-opensearch/hooks/post_push | 2 +- .../v1.16/arm64/debian-papertrail/Gemfile | 2 +- .../arm64/debian-papertrail/Gemfile.lock | 12 +-- .../arm64/debian-papertrail/hooks/post_push | 2 +- docker-image/v1.16/arm64/debian-s3/Gemfile | 2 +- .../v1.16/arm64/debian-s3/Gemfile.lock | 28 +++---- .../v1.16/arm64/debian-s3/hooks/post_push | 2 +- .../v1.16/arm64/debian-syslog/Gemfile | 2 +- .../v1.16/arm64/debian-syslog/Gemfile.lock | 12 +-- .../v1.16/arm64/debian-syslog/hooks/post_push | 2 +- docker-image/v1.16/debian-azureblob/Gemfile | 2 +- .../v1.16/debian-azureblob/Gemfile.lock | 14 ++-- .../v1.16/debian-azureblob/hooks/post_push | 2 +- docker-image/v1.16/debian-cloudwatch/Gemfile | 2 +- .../v1.16/debian-cloudwatch/Gemfile.lock | 20 ++--- .../v1.16/debian-cloudwatch/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch7/Gemfile | 2 +- .../v1.16/debian-elasticsearch7/Gemfile.lock | 12 +-- .../debian-elasticsearch7/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch8/Gemfile | 2 +- .../v1.16/debian-elasticsearch8/Gemfile.lock | 22 +++--- .../debian-elasticsearch8/hooks/post_push | 2 +- docker-image/v1.16/debian-forward/Gemfile | 2 +- .../v1.16/debian-forward/Gemfile.lock | 12 +-- .../v1.16/debian-forward/hooks/post_push | 2 +- docker-image/v1.16/debian-gcs/Gemfile | 2 +- docker-image/v1.16/debian-gcs/Gemfile.lock | 26 +++---- docker-image/v1.16/debian-gcs/hooks/post_push | 2 +- docker-image/v1.16/debian-graylog/Gemfile | 2 +- .../v1.16/debian-graylog/Gemfile.lock | 12 +-- .../v1.16/debian-graylog/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka/Gemfile | 2 +- docker-image/v1.16/debian-kafka/Gemfile.lock | 12 +-- .../v1.16/debian-kafka/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka2/Gemfile | 2 +- docker-image/v1.16/debian-kafka2/Gemfile.lock | 12 +-- .../v1.16/debian-kafka2/hooks/post_push | 2 +- docker-image/v1.16/debian-kinesis/Gemfile | 2 +- .../v1.16/debian-kinesis/Gemfile.lock | 24 +++--- .../v1.16/debian-kinesis/hooks/post_push | 2 +- docker-image/v1.16/debian-logentries/Gemfile | 2 +- .../v1.16/debian-logentries/Gemfile.lock | 12 +-- .../v1.16/debian-logentries/hooks/post_push | 2 +- docker-image/v1.16/debian-loggly/Gemfile | 2 +- docker-image/v1.16/debian-loggly/Gemfile.lock | 12 +-- .../v1.16/debian-loggly/hooks/post_push | 2 +- docker-image/v1.16/debian-logzio/Gemfile | 2 +- docker-image/v1.16/debian-logzio/Gemfile.lock | 14 ++-- .../v1.16/debian-logzio/hooks/post_push | 2 +- docker-image/v1.16/debian-opensearch/Gemfile | 2 +- .../v1.16/debian-opensearch/Gemfile.lock | 26 +++---- .../v1.16/debian-opensearch/hooks/post_push | 2 +- docker-image/v1.16/debian-papertrail/Gemfile | 2 +- .../v1.16/debian-papertrail/Gemfile.lock | 12 +-- .../v1.16/debian-papertrail/hooks/post_push | 2 +- docker-image/v1.16/debian-s3/Gemfile | 2 +- docker-image/v1.16/debian-s3/Gemfile.lock | 28 +++---- docker-image/v1.16/debian-s3/hooks/post_push | 2 +- docker-image/v1.16/debian-syslog/Gemfile | 2 +- docker-image/v1.16/debian-syslog/Gemfile.lock | 12 +-- .../v1.16/debian-syslog/hooks/post_push | 2 +- 103 files changed, 387 insertions(+), 387 deletions(-) diff --git a/README.md b/README.md index 3ac3f9292..5e6db2d6f 100644 --- a/README.md +++ b/README.md @@ -25,130 +25,130 @@ If you want to use above non published images, build it by yourself. Dockerfile ##### Multi-Arch images - `Azureblob` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-2` - `Elasticsearch8` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-2` - `Elasticsearch7` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch` - `Opensearch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-2` - `Cloudwatch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-2` - `Forward` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-2` - `Gcs` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-2` - `Graylog` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-2` - `Kafka` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-2` - `Kafka2` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-1.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-1.2` - `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` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-2` ##### x86_64 images - `Azureblob` [Dockerfile](docker-image/v1.16/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-amd64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-amd64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-amd64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-amd64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-amd64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-amd64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-amd64` - `Opensearch` [Dockerfile](docker-image/v1.16/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-amd64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-amd64-2` - `Loggly` [Dockerfile](docker-image/v1.16/debian-loggly/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-loggly-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-loggly-amd64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-loggly-amd64-2` - `Logentries` [Dockerfile](docker-image/v1.16/debian-logentries/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logentries-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logentries-amd64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-logentries-amd64-2` - `Cloudwatch` [Dockerfile](docker-image/v1.16/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-amd64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-amd64-2` - `S3` [Dockerfile](docker-image/v1.16/debian-s3/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-s3-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-s3-amd64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-s3-amd64-2` - `Syslog` [Dockerfile](docker-image/v1.16/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-amd64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-amd64-2` - `Gcs` [Dockerfile](docker-image/v1.16/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-amd64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-amd64-2` - `Graylog` [Dockerfile](docker-image/v1.16/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-amd64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-amd64-2` - `Papertrail` [Dockerfile](docker-image/v1.16/debian-papertrail/Dockerfile) - `Logzio` [Dockerfile](docker-image/v1.16/debian-logzio/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logzio-amd64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logzio-amd64-1.2` - `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.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-amd64-1.2` - `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.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-amd64-1.2` - `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` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-amd64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-amd64-2` ##### arm64 images - `Azureblob` [Dockerfile](docker-image/v1.16/arm64/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-arm64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-arm64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-arm64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-arm64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-arm64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-arm64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-arm64` - `Opensearch` [Dockerfile](docker-image/v1.16/arm64/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-arm64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-arm64-2` - `Loggly` [Dockerfile](docker-image/v1.16/arm64/debian-loggly/Dockerfile) - `Logentries` [Dockerfile](docker-image/v1.16/arm64/debian-logentries/Dockerfile) - `Cloudwatch` [Dockerfile](docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-arm64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-arm64-2` - `S3` [Dockerfile](docker-image/v1.16/arm64/debian-s3/Dockerfile) - `Syslog` [Dockerfile](docker-image/v1.16/arm64/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/arm64/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-arm64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-arm64-2` - `Gcs` [Dockerfile](docker-image/v1.16/arm64/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-arm64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-arm64-2` - `Graylog` [Dockerfile](docker-image/v1.16/arm64/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-arm64-1.0` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-arm64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-arm64-2` - `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.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-arm64-1.2` - `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.1` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-arm64-1.2` - `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` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-arm64-1.2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-arm64-2` diff --git a/docker-image/v1.16/arm64/debian-azureblob/Gemfile b/docker-image/v1.16/arm64/debian-azureblob/Gemfile index c2216d5df..8d8cdd6cc 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/Gemfile +++ b/docker-image/v1.16/arm64/debian-azureblob/Gemfile @@ -19,4 +19,4 @@ gem "azure-storage-blob", "~> 2.0" gem "fluent-plugin-azure-storage-append-blob-lts", "~> 0.7.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock index 194601132..9912c3ee4 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock @@ -83,9 +83,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -124,12 +124,12 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) multipart-post (2.4.1) - net-http-persistent (4.0.2) + net-http-persistent (4.0.4) connection_pool (~> 2.2) netrc (0.11.0) nokogiri (1.16.7) @@ -155,11 +155,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -181,7 +181,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push b/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push index 6b99397e9..c2d23c1b6 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-azureblob/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-azureblob-arm64-1.0,v1.16-debian-azureblob-arm64-2}; do +for tag in {v1.16.6-debian-azureblob-arm64-1.2,v1.16-debian-azureblob-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-cloudwatch/Gemfile b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile index 1396c03af..6e4467bac 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile +++ b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile @@ -19,4 +19,4 @@ gem "aws-sdk-cloudwatchlogs", "~> 1.0" gem "fluent-plugin-cloudwatch-logs", "~> 0.14.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock index edb431ef3..71071dd89 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock @@ -4,11 +4,11 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.966.0) - aws-sdk-cloudwatchlogs (1.88.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-partitions (1.973.0) + aws-sdk-cloudwatchlogs (1.92.0) + aws-sdk-core (~> 3, >= 3.203.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.201.5) + aws-sdk-core (3.204.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.9) @@ -61,9 +61,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -103,7 +103,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -125,11 +125,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -151,7 +151,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push index 593f18688..bb75dcdbc 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-cloudwatch/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-cloudwatch-arm64-1.0,v1.16-debian-cloudwatch-arm64-2}; do +for tag in {v1.16.6-debian-cloudwatch-arm64-1.2,v1.16-debian-cloudwatch-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-elasticsearch7/Gemfile b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile index 71c847225..3b6fb2865 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile @@ -21,4 +21,4 @@ gem "elasticsearch-xpack", "~> 7.0" gem "fluent-plugin-dedot_filter", "~> 1.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock index ce821d6ba..0aa571267 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock @@ -88,9 +88,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -129,7 +129,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) multipart-post (2.4.1) @@ -153,11 +153,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -181,7 +181,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push index abd9e725c..5f4424fec 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/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-elasticsearch7-arm64-1.0,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; do +for tag in {v1.16.6-debian-elasticsearch7-arm64-1.2,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; 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-elasticsearch8/Gemfile b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile index 1b79dd105..cc22c8e68 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile @@ -20,4 +20,4 @@ gem "fluent-plugin-elasticsearch", "~> 5.3.0" gem "fluent-plugin-dedot_filter", "~> 1.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock index c19977a40..f23b61a25 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock @@ -20,13 +20,13 @@ GEM elasticsearch-api (8.15.0) multi_json excon (0.111.0) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + faraday (2.11.0) + faraday-net_http (>= 2.0, < 3.4) logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) - faraday-net_http (3.1.1) + faraday-net_http (3.3.0) net-http ffi (1.17.0) ffi-compiler (1.3.2) @@ -71,9 +71,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -109,11 +109,11 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.0) + logger (1.6.1) lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) @@ -137,13 +137,13 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uri (0.13.0) + uri (0.13.1) webrick (1.8.1) yajl-ruby (1.4.3) @@ -165,7 +165,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push index 496dbd97f..9e452d51f 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/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-elasticsearch8-arm64-1.0,v1.16-debian-elasticsearch8-arm64-2}; do +for tag in {v1.16.6-debian-elasticsearch8-arm64-1.2,v1.16-debian-elasticsearch8-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-forward/Gemfile b/docker-image/v1.16/arm64/debian-forward/Gemfile index a9790b603..7b581460c 100644 --- a/docker-image/v1.16/arm64/debian-forward/Gemfile +++ b/docker-image/v1.16/arm64/debian-forward/Gemfile @@ -17,4 +17,4 @@ gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0" gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-forward/Gemfile.lock b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock index fc1db9951..ae33ce151 100644 --- a/docker-image/v1.16/arm64/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock @@ -46,9 +46,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -87,7 +87,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -109,11 +109,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -133,7 +133,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-forward/hooks/post_push b/docker-image/v1.16/arm64/debian-forward/hooks/post_push index 690e9145b..568aa68a5 100644 --- a/docker-image/v1.16/arm64/debian-forward/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-forward/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-forward-arm64-1.0,v1.16-debian-forward-arm64-2}; do +for tag in {v1.16.6-debian-forward-arm64-1.2,v1.16-debian-forward-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-gcs/Gemfile b/docker-image/v1.16/arm64/debian-gcs/Gemfile index 511beec3b..6a7ce31e0 100644 --- a/docker-image/v1.16/arm64/debian-gcs/Gemfile +++ b/docker-image/v1.16/arm64/debian-gcs/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-gcs", "0.4.2" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock index 8657842d6..50c19dea6 100644 --- a/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock @@ -14,10 +14,10 @@ GEM digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + faraday (2.11.0) + faraday-net_http (>= 2.0, < 3.4) logger - faraday-net_http (3.1.1) + faraday-net_http (3.3.0) net-http ffi (1.17.0) ffi-compiler (1.3.2) @@ -57,9 +57,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -83,12 +83,12 @@ GEM retriable (>= 2.0, < 4.a) google-apis-iamcredentials_v1 (0.21.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.43.0) + google-apis-storage_v1 (0.44.0) google-apis-core (>= 0.15.0, < 2.a) google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (2.1.1) + google-cloud-env (2.2.0) faraday (>= 1.0, < 3.a) google-cloud-errors (1.4.0) google-cloud-storage (1.52.0) @@ -132,11 +132,11 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.0) + logger (1.6.1) lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) mini_mime (1.1.5) msgpack (1.7.2) multi_json (1.15.0) @@ -173,15 +173,15 @@ GEM multi_json (~> 1.10) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) trailblazer-option (0.1.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uber (0.1.0) - uri (0.13.0) + uri (0.13.1) webrick (1.8.1) yajl-ruby (1.4.3) @@ -201,7 +201,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push b/docker-image/v1.16/arm64/debian-gcs/hooks/post_push index 1cf4542d8..52d8f5b59 100644 --- a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-gcs/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-gcs-arm64-1.0,v1.16-debian-gcs-arm64-2}; do +for tag in {v1.16.6-debian-gcs-arm64-1.2,v1.16-debian-gcs-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-graylog/Gemfile b/docker-image/v1.16/arm64/debian-graylog/Gemfile index 96c9e4ae1..60d4cf2f1 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Gemfile +++ b/docker-image/v1.16/arm64/debian-graylog/Gemfile @@ -19,4 +19,4 @@ gem "gelf" gem "fluent-plugin-gelf-hs", "~> 1.0.7" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock index 8a30300e3..fcd0ede28 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock @@ -49,9 +49,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -92,7 +92,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -114,11 +114,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -139,7 +139,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) gelf oj (~> 3.15.0) diff --git a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push b/docker-image/v1.16/arm64/debian-graylog/hooks/post_push index 280d77506..d3b197c32 100644 --- a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-graylog/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-graylog-arm64-1.0,v1.16-debian-graylog-arm64-2}; do +for tag in {v1.16.6-debian-graylog-arm64-1.2,v1.16-debian-graylog-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-kafka/Gemfile b/docker-image/v1.16/arm64/debian-kafka/Gemfile index f16710990..7c4f04f6f 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Gemfile +++ b/docker-image/v1.16/arm64/debian-kafka/Gemfile @@ -22,4 +22,4 @@ gem "fluent-plugin-parser-avro", "~> 0.3.1" gem "snappy", "~> 0.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock index 523f5254c..2de8df3ae 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock @@ -60,9 +60,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -102,7 +102,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0820) + mime-types-data (3.2024.0903) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -132,11 +132,11 @@ GEM snappy (0.4.0) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -159,7 +159,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rdkafka (~> 0.17.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 6f684b476..3ef7ae251 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.1,v1.16-debian-kafka-arm64-2}; do +for tag in {v1.16.6-debian-kafka-arm64-1.2,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/Gemfile b/docker-image/v1.16/arm64/debian-kafka2/Gemfile index f16710990..7c4f04f6f 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Gemfile +++ b/docker-image/v1.16/arm64/debian-kafka2/Gemfile @@ -22,4 +22,4 @@ gem "fluent-plugin-parser-avro", "~> 0.3.1" gem "snappy", "~> 0.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock index 523f5254c..2de8df3ae 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock @@ -60,9 +60,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -102,7 +102,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0820) + mime-types-data (3.2024.0903) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -132,11 +132,11 @@ GEM snappy (0.4.0) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -159,7 +159,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rdkafka (~> 0.17.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 9dbcb5d9a..a23da9a06 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.1,v1.16-debian-kafka2-arm64-2}; do +for tag in {v1.16.6-debian-kafka2-arm64-1.2,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/arm64/debian-kinesis/Gemfile b/docker-image/v1.16/arm64/debian-kinesis/Gemfile index ccd637649..bc49610f1 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/Gemfile +++ b/docker-image/v1.16/arm64/debian-kinesis/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-kinesis", "~> 3.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock index e659494ad..9abace9b2 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock @@ -4,17 +4,17 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.966.0) - aws-sdk-core (3.201.5) + aws-partitions (1.973.0) + aws-sdk-core (3.204.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.76.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-firehose (1.78.0) + aws-sdk-core (~> 3, >= 3.203.0) aws-sigv4 (~> 1.5) - aws-sdk-kinesis (1.63.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kinesis (1.65.0) + aws-sdk-core (~> 3, >= 3.203.0) aws-sigv4 (~> 1.5) aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) @@ -66,9 +66,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -109,7 +109,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -131,11 +131,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -156,7 +156,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push b/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push index bc97995ec..7171a11bf 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-kinesis/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-kinesis-arm64-1.0,v1.16-debian-kinesis-arm64-2}; do +for tag in {v1.16.6-debian-kinesis-arm64-1.2,v1.16-debian-kinesis-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-logentries/Gemfile b/docker-image/v1.16/arm64/debian-logentries/Gemfile index 7b74e1667..8dcc21c8c 100644 --- a/docker-image/v1.16/arm64/debian-logentries/Gemfile +++ b/docker-image/v1.16/arm64/debian-logentries/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" #gem "fluent-plugin-logentries" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock index fc1db9951..ae33ce151 100644 --- a/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock @@ -46,9 +46,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -87,7 +87,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -109,11 +109,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -133,7 +133,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push b/docker-image/v1.16/arm64/debian-logentries/hooks/post_push index 033534d92..b300bec70 100644 --- a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logentries/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-logentries-arm64-1.0,v1.16-debian-logentries-arm64-2}; do +for tag in {v1.16.6-debian-logentries-arm64-1.2,v1.16-debian-logentries-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-loggly/Gemfile b/docker-image/v1.16/arm64/debian-loggly/Gemfile index 1da0ba537..2fb849741 100644 --- a/docker-image/v1.16/arm64/debian-loggly/Gemfile +++ b/docker-image/v1.16/arm64/debian-loggly/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-loggly", "~> 0.0.9" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock index bce07e4f2..9f4ef01c0 100644 --- a/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock @@ -49,9 +49,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -90,7 +90,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (2.9.4) @@ -113,11 +113,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -138,7 +138,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push b/docker-image/v1.16/arm64/debian-loggly/hooks/post_push index 7abca7992..a591c4248 100644 --- a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-loggly/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-loggly-arm64-1.0,v1.16-debian-loggly-arm64-2}; do +for tag in {v1.16.6-debian-loggly-arm64-1.2,v1.16-debian-loggly-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-logzio/Gemfile b/docker-image/v1.16/arm64/debian-logzio/Gemfile index b52087298..0f3098974 100644 --- a/docker-image/v1.16/arm64/debian-logzio/Gemfile +++ b/docker-image/v1.16/arm64/debian-logzio/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-logzio", "~> 0.2.2" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock index 5a551d31e..a115977f1 100644 --- a/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock @@ -51,9 +51,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -92,10 +92,10 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) - net-http-persistent (4.0.2) + net-http-persistent (4.0.4) connection_pool (~> 2.2) netrc (0.11.0) oj (3.15.1) @@ -116,11 +116,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -141,7 +141,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push b/docker-image/v1.16/arm64/debian-logzio/hooks/post_push index 674eccc39..5ae483270 100644 --- a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logzio/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-logzio-arm64-1.0,v1.16-debian-logzio-arm64-2}; do +for tag in {v1.16.6-debian-logzio-arm64-1.2,v1.16-debian-logzio-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-opensearch/Gemfile b/docker-image/v1.16/arm64/debian-opensearch/Gemfile index b8bc49ea8..b94cae9e4 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/Gemfile +++ b/docker-image/v1.16/arm64/debian-opensearch/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-opensearch", "~> 1.1.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock index 81d381a96..9e505d549 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock @@ -4,8 +4,8 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.966.0) - aws-sdk-core (3.201.5) + aws-partitions (1.973.0) + aws-sdk-core (3.204.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.9) @@ -21,13 +21,13 @@ GEM cool.io (1.8.1) domain_name (0.6.20240107) excon (0.111.0) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + faraday (2.11.0) + faraday-net_http (>= 2.0, < 3.4) logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) - faraday-net_http (3.1.1) + faraday-net_http (3.3.0) net-http faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) @@ -75,9 +75,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -114,11 +114,11 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.0) + logger (1.6.1) lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) @@ -145,13 +145,13 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uri (0.13.0) + uri (0.13.1) webrick (1.8.1) yajl-ruby (1.4.3) @@ -171,7 +171,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push b/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push index 4b7184371..38f1019c3 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-opensearch/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-opensearch-arm64-1.0,v1.16-debian-opensearch-arm64-2}; do +for tag in {v1.16.6-debian-opensearch-arm64-1.2,v1.16-debian-opensearch-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-papertrail/Gemfile b/docker-image/v1.16/arm64/debian-papertrail/Gemfile index e588626f5..f54812a9f 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/Gemfile +++ b/docker-image/v1.16/arm64/debian-papertrail/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-papertrail", "~> 0.2.6" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock index 083d9a978..daa4c3625 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock @@ -52,9 +52,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -93,7 +93,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -115,11 +115,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uuidtools (2.2.0) webrick (1.8.1) @@ -141,7 +141,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push b/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push index 56d7892a7..edff39ef1 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-papertrail/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-papertrail-arm64-1.0,v1.16-debian-papertrail-arm64-2}; do +for tag in {v1.16.6-debian-papertrail-arm64-1.2,v1.16-debian-papertrail-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-s3/Gemfile b/docker-image/v1.16/arm64/debian-s3/Gemfile index a2ed71ff7..fbfa9e908 100644 --- a/docker-image/v1.16/arm64/debian-s3/Gemfile +++ b/docker-image/v1.16/arm64/debian-s3/Gemfile @@ -19,4 +19,4 @@ gem "aws-sdk-s3", "~> 1.101" gem "fluent-plugin-s3", "~> 1.7.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-s3/Gemfile.lock b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock index d0e4a1581..12e6bd626 100644 --- a/docker-image/v1.16/arm64/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock @@ -4,21 +4,21 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.966.0) - aws-sdk-core (3.201.5) + aws-partitions (1.973.0) + aws-sdk-core (3.204.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.88.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kms (1.90.0) + aws-sdk-core (~> 3, >= 3.203.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.158.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-s3 (1.161.0) + aws-sdk-core (~> 3, >= 3.203.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-sqs (1.80.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-sqs (1.82.0) + aws-sdk-core (~> 3, >= 3.203.0) aws-sigv4 (~> 1.5) aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) @@ -69,9 +69,9 @@ GEM aws-sdk-s3 (~> 1.60) aws-sdk-sqs (~> 1.23) fluentd (>= 0.14.22, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -111,7 +111,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -133,11 +133,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -159,7 +159,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-s3 (~> 1.7.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-s3/hooks/post_push b/docker-image/v1.16/arm64/debian-s3/hooks/post_push index e61c2d7fe..a9bcac4f5 100644 --- a/docker-image/v1.16/arm64/debian-s3/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-s3/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-s3-arm64-1.0,v1.16-debian-s3-arm64-2}; do +for tag in {v1.16.6-debian-s3-arm64-1.2,v1.16-debian-s3-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-syslog/Gemfile b/docker-image/v1.16/arm64/debian-syslog/Gemfile index 735c9cab0..004187962 100644 --- a/docker-image/v1.16/arm64/debian-syslog/Gemfile +++ b/docker-image/v1.16/arm64/debian-syslog/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-remote_syslog" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock index 7d4372caf..840d50a84 100644 --- a/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock @@ -49,9 +49,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -90,7 +90,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -115,11 +115,11 @@ GEM strptime (0.2.5) strscan (3.1.0) syslog_protocol (0.9.2) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -140,7 +140,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-remote_syslog fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push b/docker-image/v1.16/arm64/debian-syslog/hooks/post_push index ba99fa253..b92c5b5d7 100644 --- a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-syslog/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-syslog-arm64-1.0,v1.16-debian-syslog-arm64-2}; do +for tag in {v1.16.6-debian-syslog-arm64-1.2,v1.16-debian-syslog-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-azureblob/Gemfile b/docker-image/v1.16/debian-azureblob/Gemfile index c2216d5df..8d8cdd6cc 100644 --- a/docker-image/v1.16/debian-azureblob/Gemfile +++ b/docker-image/v1.16/debian-azureblob/Gemfile @@ -19,4 +19,4 @@ gem "azure-storage-blob", "~> 2.0" gem "fluent-plugin-azure-storage-append-blob-lts", "~> 0.7.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-azureblob/Gemfile.lock b/docker-image/v1.16/debian-azureblob/Gemfile.lock index 194601132..9912c3ee4 100644 --- a/docker-image/v1.16/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/debian-azureblob/Gemfile.lock @@ -83,9 +83,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -124,12 +124,12 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) multipart-post (2.4.1) - net-http-persistent (4.0.2) + net-http-persistent (4.0.4) connection_pool (~> 2.2) netrc (0.11.0) nokogiri (1.16.7) @@ -155,11 +155,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -181,7 +181,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-azureblob/hooks/post_push b/docker-image/v1.16/debian-azureblob/hooks/post_push index ca48d0ff4..1ac63978c 100644 --- a/docker-image/v1.16/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/debian-azureblob/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-azureblob-amd64-1.0,v1.16-debian-azureblob-amd64-2}; do +for tag in {v1.16.6-debian-azureblob-amd64-1.2,v1.16-debian-azureblob-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-cloudwatch/Gemfile b/docker-image/v1.16/debian-cloudwatch/Gemfile index 1396c03af..6e4467bac 100644 --- a/docker-image/v1.16/debian-cloudwatch/Gemfile +++ b/docker-image/v1.16/debian-cloudwatch/Gemfile @@ -19,4 +19,4 @@ gem "aws-sdk-cloudwatchlogs", "~> 1.0" gem "fluent-plugin-cloudwatch-logs", "~> 0.14.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-cloudwatch/Gemfile.lock b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock index edb431ef3..71071dd89 100644 --- a/docker-image/v1.16/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock @@ -4,11 +4,11 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.966.0) - aws-sdk-cloudwatchlogs (1.88.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-partitions (1.973.0) + aws-sdk-cloudwatchlogs (1.92.0) + aws-sdk-core (~> 3, >= 3.203.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.201.5) + aws-sdk-core (3.204.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.9) @@ -61,9 +61,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -103,7 +103,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -125,11 +125,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -151,7 +151,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/debian-cloudwatch/hooks/post_push index d19afa2e3..181dfa701 100644 --- a/docker-image/v1.16/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/debian-cloudwatch/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-cloudwatch-amd64-1.0,v1.16-debian-cloudwatch-amd64-2}; do +for tag in {v1.16.6-debian-cloudwatch-amd64-1.2,v1.16-debian-cloudwatch-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-elasticsearch7/Gemfile b/docker-image/v1.16/debian-elasticsearch7/Gemfile index 71c847225..3b6fb2865 100644 --- a/docker-image/v1.16/debian-elasticsearch7/Gemfile +++ b/docker-image/v1.16/debian-elasticsearch7/Gemfile @@ -21,4 +21,4 @@ gem "elasticsearch-xpack", "~> 7.0" gem "fluent-plugin-dedot_filter", "~> 1.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock index ce821d6ba..0aa571267 100644 --- a/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock @@ -88,9 +88,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -129,7 +129,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) multipart-post (2.4.1) @@ -153,11 +153,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -181,7 +181,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/debian-elasticsearch7/hooks/post_push index 0f5bab545..69d7f8354 100644 --- a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch7/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-elasticsearch7-amd64-1.0,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; do +for tag in {v1.16.6-debian-elasticsearch7-amd64-1.2,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; 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-elasticsearch8/Gemfile b/docker-image/v1.16/debian-elasticsearch8/Gemfile index 1b79dd105..cc22c8e68 100644 --- a/docker-image/v1.16/debian-elasticsearch8/Gemfile +++ b/docker-image/v1.16/debian-elasticsearch8/Gemfile @@ -20,4 +20,4 @@ gem "fluent-plugin-elasticsearch", "~> 5.3.0" gem "fluent-plugin-dedot_filter", "~> 1.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock index c19977a40..f23b61a25 100644 --- a/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock @@ -20,13 +20,13 @@ GEM elasticsearch-api (8.15.0) multi_json excon (0.111.0) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + faraday (2.11.0) + faraday-net_http (>= 2.0, < 3.4) logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) - faraday-net_http (3.1.1) + faraday-net_http (3.3.0) net-http ffi (1.17.0) ffi-compiler (1.3.2) @@ -71,9 +71,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -109,11 +109,11 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.0) + logger (1.6.1) lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) @@ -137,13 +137,13 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uri (0.13.0) + uri (0.13.1) webrick (1.8.1) yajl-ruby (1.4.3) @@ -165,7 +165,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/debian-elasticsearch8/hooks/post_push index d41923813..5924eb30d 100644 --- a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch8/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-elasticsearch8-amd64-1.0,v1.16-debian-elasticsearch8-amd64-2}; do +for tag in {v1.16.6-debian-elasticsearch8-amd64-1.2,v1.16-debian-elasticsearch8-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-forward/Gemfile b/docker-image/v1.16/debian-forward/Gemfile index a9790b603..7b581460c 100644 --- a/docker-image/v1.16/debian-forward/Gemfile +++ b/docker-image/v1.16/debian-forward/Gemfile @@ -17,4 +17,4 @@ gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0" gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-forward/Gemfile.lock b/docker-image/v1.16/debian-forward/Gemfile.lock index fc1db9951..ae33ce151 100644 --- a/docker-image/v1.16/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/debian-forward/Gemfile.lock @@ -46,9 +46,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -87,7 +87,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -109,11 +109,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -133,7 +133,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-forward/hooks/post_push b/docker-image/v1.16/debian-forward/hooks/post_push index 61f21b977..71a83747d 100644 --- a/docker-image/v1.16/debian-forward/hooks/post_push +++ b/docker-image/v1.16/debian-forward/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-forward-amd64-1.0,v1.16-debian-forward-amd64-2}; do +for tag in {v1.16.6-debian-forward-amd64-1.2,v1.16-debian-forward-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-gcs/Gemfile b/docker-image/v1.16/debian-gcs/Gemfile index 511beec3b..6a7ce31e0 100644 --- a/docker-image/v1.16/debian-gcs/Gemfile +++ b/docker-image/v1.16/debian-gcs/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-gcs", "0.4.2" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-gcs/Gemfile.lock b/docker-image/v1.16/debian-gcs/Gemfile.lock index 8657842d6..50c19dea6 100644 --- a/docker-image/v1.16/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/debian-gcs/Gemfile.lock @@ -14,10 +14,10 @@ GEM digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + faraday (2.11.0) + faraday-net_http (>= 2.0, < 3.4) logger - faraday-net_http (3.1.1) + faraday-net_http (3.3.0) net-http ffi (1.17.0) ffi-compiler (1.3.2) @@ -57,9 +57,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -83,12 +83,12 @@ GEM retriable (>= 2.0, < 4.a) google-apis-iamcredentials_v1 (0.21.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.43.0) + google-apis-storage_v1 (0.44.0) google-apis-core (>= 0.15.0, < 2.a) google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (2.1.1) + google-cloud-env (2.2.0) faraday (>= 1.0, < 3.a) google-cloud-errors (1.4.0) google-cloud-storage (1.52.0) @@ -132,11 +132,11 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.0) + logger (1.6.1) lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) mini_mime (1.1.5) msgpack (1.7.2) multi_json (1.15.0) @@ -173,15 +173,15 @@ GEM multi_json (~> 1.10) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) trailblazer-option (0.1.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uber (0.1.0) - uri (0.13.0) + uri (0.13.1) webrick (1.8.1) yajl-ruby (1.4.3) @@ -201,7 +201,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-gcs/hooks/post_push b/docker-image/v1.16/debian-gcs/hooks/post_push index 22dcb1108..f36c4e765 100644 --- a/docker-image/v1.16/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/debian-gcs/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-gcs-amd64-1.0,v1.16-debian-gcs-amd64-2}; do +for tag in {v1.16.6-debian-gcs-amd64-1.2,v1.16-debian-gcs-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-graylog/Gemfile b/docker-image/v1.16/debian-graylog/Gemfile index 96c9e4ae1..60d4cf2f1 100644 --- a/docker-image/v1.16/debian-graylog/Gemfile +++ b/docker-image/v1.16/debian-graylog/Gemfile @@ -19,4 +19,4 @@ gem "gelf" gem "fluent-plugin-gelf-hs", "~> 1.0.7" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-graylog/Gemfile.lock b/docker-image/v1.16/debian-graylog/Gemfile.lock index 8a30300e3..fcd0ede28 100644 --- a/docker-image/v1.16/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/debian-graylog/Gemfile.lock @@ -49,9 +49,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -92,7 +92,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -114,11 +114,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -139,7 +139,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) gelf oj (~> 3.15.0) diff --git a/docker-image/v1.16/debian-graylog/hooks/post_push b/docker-image/v1.16/debian-graylog/hooks/post_push index b44858033..890caf4ce 100644 --- a/docker-image/v1.16/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/debian-graylog/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-graylog-amd64-1.0,v1.16-debian-graylog-amd64-2}; do +for tag in {v1.16.6-debian-graylog-amd64-1.2,v1.16-debian-graylog-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-kafka/Gemfile b/docker-image/v1.16/debian-kafka/Gemfile index f16710990..7c4f04f6f 100644 --- a/docker-image/v1.16/debian-kafka/Gemfile +++ b/docker-image/v1.16/debian-kafka/Gemfile @@ -22,4 +22,4 @@ gem "fluent-plugin-parser-avro", "~> 0.3.1" gem "snappy", "~> 0.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-kafka/Gemfile.lock b/docker-image/v1.16/debian-kafka/Gemfile.lock index 523f5254c..2de8df3ae 100644 --- a/docker-image/v1.16/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka/Gemfile.lock @@ -60,9 +60,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -102,7 +102,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0820) + mime-types-data (3.2024.0903) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -132,11 +132,11 @@ GEM snappy (0.4.0) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -159,7 +159,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rdkafka (~> 0.17.0) diff --git a/docker-image/v1.16/debian-kafka/hooks/post_push b/docker-image/v1.16/debian-kafka/hooks/post_push index 1e339304f..7665a8444 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.1,v1.16-debian-kafka-amd64-2}; do +for tag in {v1.16.6-debian-kafka-amd64-1.2,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/Gemfile b/docker-image/v1.16/debian-kafka2/Gemfile index f16710990..7c4f04f6f 100644 --- a/docker-image/v1.16/debian-kafka2/Gemfile +++ b/docker-image/v1.16/debian-kafka2/Gemfile @@ -22,4 +22,4 @@ gem "fluent-plugin-parser-avro", "~> 0.3.1" gem "snappy", "~> 0.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-kafka2/Gemfile.lock b/docker-image/v1.16/debian-kafka2/Gemfile.lock index 523f5254c..2de8df3ae 100644 --- a/docker-image/v1.16/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka2/Gemfile.lock @@ -60,9 +60,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -102,7 +102,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0820) + mime-types-data (3.2024.0903) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -132,11 +132,11 @@ GEM snappy (0.4.0) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -159,7 +159,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rdkafka (~> 0.17.0) diff --git a/docker-image/v1.16/debian-kafka2/hooks/post_push b/docker-image/v1.16/debian-kafka2/hooks/post_push index 4440c3f0e..3cde0e476 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.1,v1.16-debian-kafka2-amd64-2}; do +for tag in {v1.16.6-debian-kafka2-amd64-1.2,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 diff --git a/docker-image/v1.16/debian-kinesis/Gemfile b/docker-image/v1.16/debian-kinesis/Gemfile index ccd637649..bc49610f1 100644 --- a/docker-image/v1.16/debian-kinesis/Gemfile +++ b/docker-image/v1.16/debian-kinesis/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-kinesis", "~> 3.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-kinesis/Gemfile.lock b/docker-image/v1.16/debian-kinesis/Gemfile.lock index e659494ad..9abace9b2 100644 --- a/docker-image/v1.16/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/debian-kinesis/Gemfile.lock @@ -4,17 +4,17 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.966.0) - aws-sdk-core (3.201.5) + aws-partitions (1.973.0) + aws-sdk-core (3.204.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.76.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-firehose (1.78.0) + aws-sdk-core (~> 3, >= 3.203.0) aws-sigv4 (~> 1.5) - aws-sdk-kinesis (1.63.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kinesis (1.65.0) + aws-sdk-core (~> 3, >= 3.203.0) aws-sigv4 (~> 1.5) aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) @@ -66,9 +66,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -109,7 +109,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -131,11 +131,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -156,7 +156,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-kinesis/hooks/post_push b/docker-image/v1.16/debian-kinesis/hooks/post_push index f29c1b18f..7757e66e3 100644 --- a/docker-image/v1.16/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/debian-kinesis/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-kinesis-amd64-1.0,v1.16-debian-kinesis-amd64-2}; do +for tag in {v1.16.6-debian-kinesis-amd64-1.2,v1.16-debian-kinesis-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-logentries/Gemfile b/docker-image/v1.16/debian-logentries/Gemfile index 7b74e1667..8dcc21c8c 100644 --- a/docker-image/v1.16/debian-logentries/Gemfile +++ b/docker-image/v1.16/debian-logentries/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" #gem "fluent-plugin-logentries" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-logentries/Gemfile.lock b/docker-image/v1.16/debian-logentries/Gemfile.lock index fc1db9951..ae33ce151 100644 --- a/docker-image/v1.16/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/debian-logentries/Gemfile.lock @@ -46,9 +46,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -87,7 +87,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -109,11 +109,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -133,7 +133,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-logentries/hooks/post_push b/docker-image/v1.16/debian-logentries/hooks/post_push index 6f7429f7a..ab830b5fa 100644 --- a/docker-image/v1.16/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/debian-logentries/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-logentries-amd64-1.0,v1.16-debian-logentries-amd64-2}; do +for tag in {v1.16.6-debian-logentries-amd64-1.2,v1.16-debian-logentries-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-loggly/Gemfile b/docker-image/v1.16/debian-loggly/Gemfile index 1da0ba537..2fb849741 100644 --- a/docker-image/v1.16/debian-loggly/Gemfile +++ b/docker-image/v1.16/debian-loggly/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-loggly", "~> 0.0.9" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-loggly/Gemfile.lock b/docker-image/v1.16/debian-loggly/Gemfile.lock index bce07e4f2..9f4ef01c0 100644 --- a/docker-image/v1.16/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/debian-loggly/Gemfile.lock @@ -49,9 +49,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -90,7 +90,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (2.9.4) @@ -113,11 +113,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -138,7 +138,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-loggly/hooks/post_push b/docker-image/v1.16/debian-loggly/hooks/post_push index cf958e8b8..70ec7e62b 100644 --- a/docker-image/v1.16/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/debian-loggly/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-loggly-amd64-1.0,v1.16-debian-loggly-amd64-2}; do +for tag in {v1.16.6-debian-loggly-amd64-1.2,v1.16-debian-loggly-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-logzio/Gemfile b/docker-image/v1.16/debian-logzio/Gemfile index b52087298..0f3098974 100644 --- a/docker-image/v1.16/debian-logzio/Gemfile +++ b/docker-image/v1.16/debian-logzio/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-logzio", "~> 0.2.2" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-logzio/Gemfile.lock b/docker-image/v1.16/debian-logzio/Gemfile.lock index 5a551d31e..a115977f1 100644 --- a/docker-image/v1.16/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/debian-logzio/Gemfile.lock @@ -51,9 +51,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -92,10 +92,10 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) - net-http-persistent (4.0.2) + net-http-persistent (4.0.4) connection_pool (~> 2.2) netrc (0.11.0) oj (3.15.1) @@ -116,11 +116,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -141,7 +141,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-logzio/hooks/post_push b/docker-image/v1.16/debian-logzio/hooks/post_push index 2c9648172..5c4299992 100644 --- a/docker-image/v1.16/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/debian-logzio/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-logzio-amd64-1.0,v1.16-debian-logzio-amd64-2}; do +for tag in {v1.16.6-debian-logzio-amd64-1.2,v1.16-debian-logzio-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-opensearch/Gemfile b/docker-image/v1.16/debian-opensearch/Gemfile index b8bc49ea8..b94cae9e4 100644 --- a/docker-image/v1.16/debian-opensearch/Gemfile +++ b/docker-image/v1.16/debian-opensearch/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-opensearch", "~> 1.1.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-opensearch/Gemfile.lock b/docker-image/v1.16/debian-opensearch/Gemfile.lock index 81d381a96..9e505d549 100644 --- a/docker-image/v1.16/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/debian-opensearch/Gemfile.lock @@ -4,8 +4,8 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.966.0) - aws-sdk-core (3.201.5) + aws-partitions (1.973.0) + aws-sdk-core (3.204.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.9) @@ -21,13 +21,13 @@ GEM cool.io (1.8.1) domain_name (0.6.20240107) excon (0.111.0) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + faraday (2.11.0) + faraday-net_http (>= 2.0, < 3.4) logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) - faraday-net_http (3.1.1) + faraday-net_http (3.3.0) net-http faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) @@ -75,9 +75,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -114,11 +114,11 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.0) + logger (1.6.1) lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) @@ -145,13 +145,13 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uri (0.13.0) + uri (0.13.1) webrick (1.8.1) yajl-ruby (1.4.3) @@ -171,7 +171,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-opensearch/hooks/post_push b/docker-image/v1.16/debian-opensearch/hooks/post_push index f855e312f..e9dc27318 100644 --- a/docker-image/v1.16/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/debian-opensearch/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-opensearch-amd64-1.0,v1.16-debian-opensearch-amd64-2}; do +for tag in {v1.16.6-debian-opensearch-amd64-1.2,v1.16-debian-opensearch-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-papertrail/Gemfile b/docker-image/v1.16/debian-papertrail/Gemfile index e588626f5..f54812a9f 100644 --- a/docker-image/v1.16/debian-papertrail/Gemfile +++ b/docker-image/v1.16/debian-papertrail/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-papertrail", "~> 0.2.6" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-papertrail/Gemfile.lock b/docker-image/v1.16/debian-papertrail/Gemfile.lock index 083d9a978..daa4c3625 100644 --- a/docker-image/v1.16/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/debian-papertrail/Gemfile.lock @@ -52,9 +52,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -93,7 +93,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -115,11 +115,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uuidtools (2.2.0) webrick (1.8.1) @@ -141,7 +141,7 @@ DEPENDENCIES fluent-plugin-prometheus (~> 2.1.0) fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-papertrail/hooks/post_push b/docker-image/v1.16/debian-papertrail/hooks/post_push index 55e10c526..6058188d8 100644 --- a/docker-image/v1.16/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/debian-papertrail/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-papertrail-amd64-1.0,v1.16-debian-papertrail-amd64-2}; do +for tag in {v1.16.6-debian-papertrail-amd64-1.2,v1.16-debian-papertrail-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-s3/Gemfile b/docker-image/v1.16/debian-s3/Gemfile index a2ed71ff7..fbfa9e908 100644 --- a/docker-image/v1.16/debian-s3/Gemfile +++ b/docker-image/v1.16/debian-s3/Gemfile @@ -19,4 +19,4 @@ gem "aws-sdk-s3", "~> 1.101" gem "fluent-plugin-s3", "~> 1.7.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-s3/Gemfile.lock b/docker-image/v1.16/debian-s3/Gemfile.lock index d0e4a1581..12e6bd626 100644 --- a/docker-image/v1.16/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/debian-s3/Gemfile.lock @@ -4,21 +4,21 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.966.0) - aws-sdk-core (3.201.5) + aws-partitions (1.973.0) + aws-sdk-core (3.204.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.88.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kms (1.90.0) + aws-sdk-core (~> 3, >= 3.203.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.158.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-s3 (1.161.0) + aws-sdk-core (~> 3, >= 3.203.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-sqs (1.80.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-sqs (1.82.0) + aws-sdk-core (~> 3, >= 3.203.0) aws-sigv4 (~> 1.5) aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) @@ -69,9 +69,9 @@ GEM aws-sdk-s3 (~> 1.60) aws-sdk-sqs (~> 1.23) fluentd (>= 0.14.22, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -111,7 +111,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -133,11 +133,11 @@ GEM sigdump (0.2.5) strptime (0.2.5) strscan (3.1.0) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -159,7 +159,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-rewrite-tag-filter (~> 2.4.0) fluent-plugin-s3 (~> 1.7.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-s3/hooks/post_push b/docker-image/v1.16/debian-s3/hooks/post_push index d5c4bc7c9..e1e33863d 100644 --- a/docker-image/v1.16/debian-s3/hooks/post_push +++ b/docker-image/v1.16/debian-s3/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-s3-amd64-1.0,v1.16-debian-s3-amd64-2}; do +for tag in {v1.16.6-debian-s3-amd64-1.2,v1.16-debian-s3-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-syslog/Gemfile b/docker-image/v1.16/debian-syslog/Gemfile index 735c9cab0..004187962 100644 --- a/docker-image/v1.16/debian-syslog/Gemfile +++ b/docker-image/v1.16/debian-syslog/Gemfile @@ -18,4 +18,4 @@ gem "fluent-plugin-parser-cri", "~> 0.1.0" gem "fluent-plugin-remote_syslog" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" -gem "fluent-plugin-systemd", "~> 1.0.5" +gem "fluent-plugin-systemd", "~> 1.1.0" diff --git a/docker-image/v1.16/debian-syslog/Gemfile.lock b/docker-image/v1.16/debian-syslog/Gemfile.lock index 7d4372caf..840d50a84 100644 --- a/docker-image/v1.16/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/debian-syslog/Gemfile.lock @@ -49,9 +49,9 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-systemd (1.0.5) + fluent-plugin-systemd (1.1.0) fluentd (>= 0.14.11, < 2) - systemd-journal (~> 1.4.2) + systemd-journal (~> 2.0.0) fluentd (1.16.6) bundler console (< 1.24) @@ -90,7 +90,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) @@ -115,11 +115,11 @@ GEM strptime (0.2.5) strscan (3.1.0) syslog_protocol (0.9.2) - systemd-journal (1.4.2) + systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) webrick (1.8.1) yajl-ruby (1.4.3) @@ -140,7 +140,7 @@ DEPENDENCIES fluent-plugin-record-modifier (~> 2.1.0) fluent-plugin-remote_syslog fluent-plugin-rewrite-tag-filter (~> 2.4.0) - fluent-plugin-systemd (~> 1.0.5) + fluent-plugin-systemd (~> 1.1.0) fluentd (= 1.16.6) oj (~> 3.15.0) rexml (~> 3.2.5) diff --git a/docker-image/v1.16/debian-syslog/hooks/post_push b/docker-image/v1.16/debian-syslog/hooks/post_push index 9e84462c5..4f1345808 100644 --- a/docker-image/v1.16/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/debian-syslog/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-syslog-amd64-1.0,v1.16-debian-syslog-amd64-2}; do +for tag in {v1.16.6-debian-syslog-amd64-1.2,v1.16-debian-syslog-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 From 657fe2745ea09226207bb28381aa864ea07845e3 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 18 Dec 2024 12:13:05 +0900 Subject: [PATCH 24/26] Backport: fix failure on IPv6 single stack cluster When FLUENT_FILTER_KUBERNETES_URL is not set, KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT are used as a fallback. When applying such a fallback, it will fail on only IPv6 is available. It causes the following error: /usr/local/lib/ruby/3.2.0/uri/rfc3986_parser.rb:66:in `split': bad URI(is not URI?): "https://IPV6_ADDRESS:443/api" (URI::InvalidURIError) IPv6 address must be enclosed with square brackets. Closes: #1546 Signed-off-by: Kentaro Hayashi --- templates/conf/kubernetes.conf.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/conf/kubernetes.conf.erb b/templates/conf/kubernetes.conf.erb index cac425881..99e67a15f 100644 --- a/templates/conf/kubernetes.conf.erb +++ b/templates/conf/kubernetes.conf.erb @@ -28,7 +28,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" From eca5f95245346656d3115f994d1ad9206a6e904f Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 18 Dec 2024 16:49:16 +0900 Subject: [PATCH 25/26] Bump version to v1.16.6-1.3 Signed-off-by: Kentaro Hayashi --- Makefile | 69 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 4c456c7fb..31f6878f3 100644 --- a/Makefile +++ b/Makefile @@ -11,45 +11,46 @@ # make release-all IMAGE_NAME := fluent/fluentd-kubernetes +# NOTE: elasticsearch6 and stackdriver recipe files were kept, but not supported anymore. X86_IMAGES := \ - v1.16/debian-azureblob:v1.16.6-debian-azureblob-amd64-1.2,v1.16-debian-azureblob-amd64-2 \ - v1.16/debian-elasticsearch8:v1.16.6-debian-elasticsearch8-amd64-1.2,v1.16-debian-elasticsearch8-amd64-2 \ - v1.16/debian-elasticsearch7:v1.16.6-debian-elasticsearch7-amd64-1.2,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ - v1.16/debian-opensearch:v1.16.6-debian-opensearch-amd64-1.2,v1.16-debian-opensearch-amd64-2 \ - v1.16/debian-loggly:v1.16.6-debian-loggly-amd64-1.2,v1.16-debian-loggly-amd64-2 \ - v1.16/debian-logentries:v1.16.6-debian-logentries-amd64-1.2,v1.16-debian-logentries-amd64-2 \ - v1.16/debian-cloudwatch:v1.16.6-debian-cloudwatch-amd64-1.2,v1.16-debian-cloudwatch-amd64-2 \ - v1.16/debian-s3:v1.16.6-debian-s3-amd64-1.2,v1.16-debian-s3-amd64-2 \ - v1.16/debian-syslog:v1.16.6-debian-syslog-amd64-1.2,v1.16-debian-syslog-amd64-2 \ - v1.16/debian-forward:v1.16.6-debian-forward-amd64-1.2,v1.16-debian-forward-amd64-2 \ - v1.16/debian-gcs:v1.16.6-debian-gcs-amd64-1.2,v1.16-debian-gcs-amd64-2 \ - v1.16/debian-graylog:v1.16.6-debian-graylog-amd64-1.2,v1.16-debian-graylog-amd64-2 \ - v1.16/debian-papertrail:v1.16.6-debian-papertrail-amd64-1.2,v1.16-debian-papertrail-amd64-2 \ - v1.16/debian-logzio:v1.16.6-debian-logzio-amd64-1.2,v1.16-debian-logzio-amd64-2 \ - v1.16/debian-kafka:v1.16.6-debian-kafka-amd64-1.2,v1.16-debian-kafka-amd64-2 \ - v1.16/debian-kafka2:v1.16.6-debian-kafka2-amd64-1.2,v1.16-debian-kafka2-amd64-2 \ - v1.16/debian-kinesis:v1.16.6-debian-kinesis-amd64-1.2,v1.16-debian-kinesis-amd64-2 + v1.16/debian-azureblob:v1.16.6-debian-azureblob-amd64-1.3,v1.16-debian-azureblob-amd64-2 \ + v1.16/debian-elasticsearch8:v1.16.6-debian-elasticsearch8-amd64-1.3,v1.16-debian-elasticsearch8-amd64-2 \ + v1.16/debian-elasticsearch7:v1.16.6-debian-elasticsearch7-amd64-1.3,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ + v1.16/debian-opensearch:v1.16.6-debian-opensearch-amd64-1.3,v1.16-debian-opensearch-amd64-2 \ + v1.16/debian-loggly:v1.16.6-debian-loggly-amd64-1.3,v1.16-debian-loggly-amd64-2 \ + v1.16/debian-logentries:v1.16.6-debian-logentries-amd64-1.3,v1.16-debian-logentries-amd64-2 \ + v1.16/debian-cloudwatch:v1.16.6-debian-cloudwatch-amd64-1.3,v1.16-debian-cloudwatch-amd64-2 \ + v1.16/debian-s3:v1.16.6-debian-s3-amd64-1.3,v1.16-debian-s3-amd64-2 \ + v1.16/debian-syslog:v1.16.6-debian-syslog-amd64-1.3,v1.16-debian-syslog-amd64-2 \ + v1.16/debian-forward:v1.16.6-debian-forward-amd64-1.3,v1.16-debian-forward-amd64-2 \ + v1.16/debian-gcs:v1.16.6-debian-gcs-amd64-1.3,v1.16-debian-gcs-amd64-2 \ + v1.16/debian-graylog:v1.16.6-debian-graylog-amd64-1.3,v1.16-debian-graylog-amd64-2 \ + v1.16/debian-papertrail:v1.16.6-debian-papertrail-amd64-1.3,v1.16-debian-papertrail-amd64-2 \ + v1.16/debian-logzio:v1.16.6-debian-logzio-amd64-1.3,v1.16-debian-logzio-amd64-2 \ + v1.16/debian-kafka:v1.16.6-debian-kafka-amd64-1.3,v1.16-debian-kafka-amd64-2 \ + v1.16/debian-kafka2:v1.16.6-debian-kafka2-amd64-1.3,v1.16-debian-kafka2-amd64-2 \ + v1.16/debian-kinesis:v1.16.6-debian-kinesis-amd64-1.3,v1.16-debian-kinesis-amd64-2 # :,,,... ARM64_IMAGES := \ - v1.16/arm64/debian-azureblob:v1.16.6-debian-azureblob-arm64-1.2,v1.16-debian-azureblob-arm64-2 \ - v1.16/arm64/debian-elasticsearch8:v1.16.6-debian-elasticsearch8-arm64-1.2,v1.16-debian-elasticsearch8-arm64-2 \ - v1.16/arm64/debian-elasticsearch7:v1.16.6-debian-elasticsearch7-arm64-1.2,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ - v1.16/arm64/debian-opensearch:v1.16.6-debian-opensearch-arm64-1.2,v1.16-debian-opensearch-arm64-2 \ - v1.16/arm64/debian-loggly:v1.16.6-debian-loggly-arm64-1.2,v1.16-debian-loggly-arm64-2 \ - v1.16/arm64/debian-logentries:v1.16.6-debian-logentries-arm64-1.2,v1.16-debian-logentries-arm64-2 \ - v1.16/arm64/debian-cloudwatch:v1.16.6-debian-cloudwatch-arm64-1.2,v1.16-debian-cloudwatch-arm64-2 \ - v1.16/arm64/debian-s3:v1.16.6-debian-s3-arm64-1.2,v1.16-debian-s3-arm64-2 \ - v1.16/arm64/debian-syslog:v1.16.6-debian-syslog-arm64-1.2,v1.16-debian-syslog-arm64-2 \ - v1.16/arm64/debian-forward:v1.16.6-debian-forward-arm64-1.2,v1.16-debian-forward-arm64-2 \ - v1.16/arm64/debian-gcs:v1.16.6-debian-gcs-arm64-1.2,v1.16-debian-gcs-arm64-2 \ - v1.16/arm64/debian-graylog:v1.16.6-debian-graylog-arm64-1.2,v1.16-debian-graylog-arm64-2 \ - v1.16/arm64/debian-papertrail:v1.16.6-debian-papertrail-arm64-1.2,v1.16-debian-papertrail-arm64-2 \ - v1.16/arm64/debian-logzio:v1.16.6-debian-logzio-arm64-1.2,v1.16-debian-logzio-arm64-2 \ - v1.16/arm64/debian-kafka:v1.16.6-debian-kafka-arm64-1.2,v1.16-debian-kafka-arm64-2 \ - v1.16/arm64/debian-kafka2:v1.16.6-debian-kafka2-arm64-1.2,v1.16-debian-kafka2-arm64-2 \ - v1.16/arm64/debian-kinesis:v1.16.6-debian-kinesis-arm64-1.2,v1.16-debian-kinesis-arm64-2 + v1.16/arm64/debian-azureblob:v1.16.6-debian-azureblob-arm64-1.3,v1.16-debian-azureblob-arm64-2 \ + v1.16/arm64/debian-elasticsearch8:v1.16.6-debian-elasticsearch8-arm64-1.3,v1.16-debian-elasticsearch8-arm64-2 \ + v1.16/arm64/debian-elasticsearch7:v1.16.6-debian-elasticsearch7-arm64-1.3,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ + v1.16/arm64/debian-opensearch:v1.16.6-debian-opensearch-arm64-1.3,v1.16-debian-opensearch-arm64-2 \ + v1.16/arm64/debian-loggly:v1.16.6-debian-loggly-arm64-1.3,v1.16-debian-loggly-arm64-2 \ + v1.16/arm64/debian-logentries:v1.16.6-debian-logentries-arm64-1.3,v1.16-debian-logentries-arm64-2 \ + v1.16/arm64/debian-cloudwatch:v1.16.6-debian-cloudwatch-arm64-1.3,v1.16-debian-cloudwatch-arm64-2 \ + v1.16/arm64/debian-s3:v1.16.6-debian-s3-arm64-1.3,v1.16-debian-s3-arm64-2 \ + v1.16/arm64/debian-syslog:v1.16.6-debian-syslog-arm64-1.3,v1.16-debian-syslog-arm64-2 \ + v1.16/arm64/debian-forward:v1.16.6-debian-forward-arm64-1.3,v1.16-debian-forward-arm64-2 \ + v1.16/arm64/debian-gcs:v1.16.6-debian-gcs-arm64-1.3,v1.16-debian-gcs-arm64-2 \ + v1.16/arm64/debian-graylog:v1.16.6-debian-graylog-arm64-1.3,v1.16-debian-graylog-arm64-2 \ + v1.16/arm64/debian-papertrail:v1.16.6-debian-papertrail-arm64-1.3,v1.16-debian-papertrail-arm64-2 \ + v1.16/arm64/debian-logzio:v1.16.6-debian-logzio-arm64-1.3,v1.16-debian-logzio-arm64-2 \ + v1.16/arm64/debian-kafka:v1.16.6-debian-kafka-arm64-1.3,v1.16-debian-kafka-arm64-2 \ + v1.16/arm64/debian-kafka2:v1.16.6-debian-kafka2-arm64-1.3,v1.16-debian-kafka2-arm64-2 \ + v1.16/arm64/debian-kinesis:v1.16.6-debian-kinesis-arm64-1.3,v1.16-debian-kinesis-arm64-2 ALL_IMAGES := $(X86_IMAGES) $(ARM64_IMAGES) From 93ad7c9d7969c39cd5139ae24e745178b03bac63 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 18 Dec 2024 16:56:26 +0900 Subject: [PATCH 26/26] Add v1.16.6-1.3 images Signed-off-by: Kentaro Hayashi --- README.md | 74 +++++++++---------- .../v1.16/arm64/debian-azureblob/Gemfile.lock | 44 ++++++----- .../debian-azureblob/conf/kubernetes.conf | 2 +- .../arm64/debian-azureblob/hooks/post_push | 2 +- .../arm64/debian-cloudwatch/Gemfile.lock | 42 ++++++----- .../debian-cloudwatch/conf/kubernetes.conf | 2 +- .../arm64/debian-cloudwatch/hooks/post_push | 2 +- .../arm64/debian-elasticsearch7/Gemfile.lock | 38 ++++++---- .../conf/kubernetes.conf | 2 +- .../debian-elasticsearch7/hooks/post_push | 2 +- .../arm64/debian-elasticsearch8/Gemfile.lock | 58 ++++++++------- .../conf/kubernetes.conf | 2 +- .../debian-elasticsearch8/hooks/post_push | 2 +- .../v1.16/arm64/debian-forward/Gemfile.lock | 30 +++++--- .../arm64/debian-forward/conf/kubernetes.conf | 2 +- .../arm64/debian-forward/hooks/post_push | 2 +- .../v1.16/arm64/debian-gcs/Gemfile.lock | 62 +++++++++------- .../arm64/debian-gcs/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-gcs/hooks/post_push | 2 +- .../v1.16/arm64/debian-graylog/Gemfile.lock | 30 +++++--- .../arm64/debian-graylog/conf/kubernetes.conf | 2 +- .../arm64/debian-graylog/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka/Gemfile.lock | 32 ++++---- .../arm64/debian-kafka/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-kafka/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka2/Gemfile.lock | 32 ++++---- .../arm64/debian-kafka2/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-kafka2/hooks/post_push | 2 +- .../v1.16/arm64/debian-kinesis/Gemfile.lock | 48 ++++++------ .../arm64/debian-kinesis/conf/kubernetes.conf | 2 +- .../arm64/debian-kinesis/hooks/post_push | 2 +- .../arm64/debian-logentries/Gemfile.lock | 30 +++++--- .../debian-logentries/conf/kubernetes.conf | 2 +- .../arm64/debian-logentries/hooks/post_push | 2 +- .../v1.16/arm64/debian-loggly/Gemfile.lock | 30 +++++--- .../arm64/debian-loggly/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-loggly/hooks/post_push | 2 +- .../v1.16/arm64/debian-logzio/Gemfile.lock | 32 ++++---- .../arm64/debian-logzio/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-logzio/hooks/post_push | 2 +- .../arm64/debian-opensearch/Gemfile.lock | 64 ++++++++-------- .../debian-opensearch/conf/kubernetes.conf | 2 +- .../arm64/debian-opensearch/hooks/post_push | 2 +- .../arm64/debian-papertrail/Gemfile.lock | 30 +++++--- .../debian-papertrail/conf/kubernetes.conf | 2 +- .../arm64/debian-papertrail/hooks/post_push | 2 +- .../v1.16/arm64/debian-s3/Gemfile.lock | 50 +++++++------ .../arm64/debian-s3/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-s3/hooks/post_push | 2 +- .../v1.16/arm64/debian-syslog/Gemfile.lock | 30 +++++--- .../arm64/debian-syslog/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-syslog/hooks/post_push | 2 +- .../v1.16/debian-azureblob/Gemfile.lock | 44 ++++++----- .../debian-azureblob/conf/kubernetes.conf | 2 +- .../v1.16/debian-azureblob/hooks/post_push | 2 +- .../v1.16/debian-cloudwatch/Gemfile.lock | 42 ++++++----- .../debian-cloudwatch/conf/kubernetes.conf | 2 +- .../v1.16/debian-cloudwatch/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch7/Gemfile.lock | 38 ++++++---- .../conf/kubernetes.conf | 2 +- .../debian-elasticsearch7/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch8/Gemfile.lock | 58 ++++++++------- .../conf/kubernetes.conf | 2 +- .../debian-elasticsearch8/hooks/post_push | 2 +- .../v1.16/debian-forward/Gemfile.lock | 30 +++++--- .../v1.16/debian-forward/conf/kubernetes.conf | 2 +- .../v1.16/debian-forward/hooks/post_push | 2 +- docker-image/v1.16/debian-gcs/Gemfile.lock | 62 +++++++++------- .../v1.16/debian-gcs/conf/kubernetes.conf | 2 +- docker-image/v1.16/debian-gcs/hooks/post_push | 2 +- .../v1.16/debian-graylog/Gemfile.lock | 30 +++++--- .../v1.16/debian-graylog/conf/kubernetes.conf | 2 +- .../v1.16/debian-graylog/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka/Gemfile.lock | 32 ++++---- .../v1.16/debian-kafka/conf/kubernetes.conf | 2 +- .../v1.16/debian-kafka/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka2/Gemfile.lock | 32 ++++---- .../v1.16/debian-kafka2/conf/kubernetes.conf | 2 +- .../v1.16/debian-kafka2/hooks/post_push | 2 +- .../v1.16/debian-kinesis/Gemfile.lock | 48 ++++++------ .../v1.16/debian-kinesis/conf/kubernetes.conf | 2 +- .../v1.16/debian-kinesis/hooks/post_push | 2 +- .../v1.16/debian-logentries/Gemfile.lock | 30 +++++--- .../debian-logentries/conf/kubernetes.conf | 2 +- .../v1.16/debian-logentries/hooks/post_push | 2 +- docker-image/v1.16/debian-loggly/Gemfile.lock | 30 +++++--- .../v1.16/debian-loggly/conf/kubernetes.conf | 2 +- .../v1.16/debian-loggly/hooks/post_push | 2 +- docker-image/v1.16/debian-logzio/Gemfile.lock | 32 ++++---- .../v1.16/debian-logzio/conf/kubernetes.conf | 2 +- .../v1.16/debian-logzio/hooks/post_push | 2 +- .../v1.16/debian-opensearch/Gemfile.lock | 64 ++++++++-------- .../debian-opensearch/conf/kubernetes.conf | 2 +- .../v1.16/debian-opensearch/hooks/post_push | 2 +- .../v1.16/debian-papertrail/Gemfile.lock | 30 +++++--- .../debian-papertrail/conf/kubernetes.conf | 2 +- .../v1.16/debian-papertrail/hooks/post_push | 2 +- docker-image/v1.16/debian-s3/Gemfile.lock | 50 +++++++------ .../v1.16/debian-s3/conf/kubernetes.conf | 2 +- docker-image/v1.16/debian-s3/hooks/post_push | 2 +- docker-image/v1.16/debian-syslog/Gemfile.lock | 30 +++++--- .../v1.16/debian-syslog/conf/kubernetes.conf | 2 +- .../v1.16/debian-syslog/hooks/post_push | 2 +- 103 files changed, 891 insertions(+), 683 deletions(-) diff --git a/README.md b/README.md index 5e6db2d6f..1efb11ec6 100644 --- a/README.md +++ b/README.md @@ -25,130 +25,130 @@ If you want to use above non published images, build it by yourself. Dockerfile ##### Multi-Arch images - `Azureblob` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-2` - `Elasticsearch8` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-2` - `Elasticsearch7` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch` - `Opensearch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-2` - `Cloudwatch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-2` - `Forward` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-2` - `Gcs` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-2` - `Graylog` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-2` - `Kafka` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-2` - `Kafka2` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-2` - `Kinesis` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-2` ##### x86_64 images - `Azureblob` [Dockerfile](docker-image/v1.16/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-amd64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-amd64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-amd64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-amd64` - `Opensearch` [Dockerfile](docker-image/v1.16/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-amd64-2` - `Loggly` [Dockerfile](docker-image/v1.16/debian-loggly/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-loggly-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-loggly-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-loggly-amd64-2` - `Logentries` [Dockerfile](docker-image/v1.16/debian-logentries/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logentries-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logentries-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-logentries-amd64-2` - `Cloudwatch` [Dockerfile](docker-image/v1.16/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-amd64-2` - `S3` [Dockerfile](docker-image/v1.16/debian-s3/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-s3-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-s3-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-s3-amd64-2` - `Syslog` [Dockerfile](docker-image/v1.16/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-amd64-2` - `Gcs` [Dockerfile](docker-image/v1.16/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-amd64-2` - `Graylog` [Dockerfile](docker-image/v1.16/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-amd64-2` - `Papertrail` [Dockerfile](docker-image/v1.16/debian-papertrail/Dockerfile) - `Logzio` [Dockerfile](docker-image/v1.16/debian-logzio/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logzio-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logzio-amd64-1.3` - `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.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-amd64-1.3` - `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.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-amd64-1.3` - `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.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-amd64-2` ##### arm64 images - `Azureblob` [Dockerfile](docker-image/v1.16/arm64/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-arm64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-arm64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-arm64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-arm64` - `Opensearch` [Dockerfile](docker-image/v1.16/arm64/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-arm64-2` - `Loggly` [Dockerfile](docker-image/v1.16/arm64/debian-loggly/Dockerfile) - `Logentries` [Dockerfile](docker-image/v1.16/arm64/debian-logentries/Dockerfile) - `Cloudwatch` [Dockerfile](docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-arm64-2` - `S3` [Dockerfile](docker-image/v1.16/arm64/debian-s3/Dockerfile) - `Syslog` [Dockerfile](docker-image/v1.16/arm64/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/arm64/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-arm64-2` - `Gcs` [Dockerfile](docker-image/v1.16/arm64/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-arm64-2` - `Graylog` [Dockerfile](docker-image/v1.16/arm64/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-arm64-2` - `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.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-arm64-1.3` - `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.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-arm64-1.3` - `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.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-arm64-2` diff --git a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock index 9912c3ee4..674619835 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock @@ -18,9 +18,9 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) - faraday (1.10.3) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -36,14 +36,14 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.0) + faraday_middleware (1.2.1) faraday (~> 1.0) ffi (1.17.0) ffi-compiler (1.3.2) @@ -60,8 +60,8 @@ GEM fluentd (>= 0.14.10, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -106,11 +106,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -121,27 +121,31 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - mini_portile2 (2.8.7) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + mini_portile2 (2.8.8) + msgpack (1.7.5) multi_json (1.15.0) multipart-post (2.4.1) - net-http-persistent (4.0.4) + net-http-persistent (4.0.5) connection_pool (~> 2.2) netrc (0.11.0) - nokogiri (1.16.7) + nokogiri (1.17.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) racc (1.8.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -150,18 +154,20 @@ GEM rexml (3.2.9) strscan ruby2_keywords (0.0.5) - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-azureblob/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-azureblob/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-azureblob/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push b/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push index c2d23c1b6..7af481656 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-azureblob/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-azureblob-arm64-1.2,v1.16-debian-azureblob-arm64-2}; do +for tag in {v1.16.6-debian-azureblob-arm64-1.3,v1.16-debian-azureblob-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-cloudwatch/Gemfile.lock b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock index 71071dd89..19666e2b7 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock @@ -4,16 +4,16 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-cloudwatchlogs (1.92.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-partitions (1.1026.0) + aws-sdk-cloudwatchlogs (1.105.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.204.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -21,7 +21,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -38,8 +38,8 @@ GEM fluentd (>= 1.8.0) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -84,12 +84,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -100,19 +100,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -120,18 +124,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-cloudwatch/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-cloudwatch/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push index bb75dcdbc..1dacadac1 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-cloudwatch/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-cloudwatch-arm64-1.2,v1.16-debian-cloudwatch-arm64-2}; do +for tag in {v1.16.6-debian-cloudwatch-arm64-1.3,v1.16-debian-cloudwatch-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-elasticsearch7/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock index 0aa571267..9d454aff7 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) elasticsearch (7.17.11) elasticsearch-api (= 7.17.11) @@ -22,8 +22,8 @@ GEM multi_json elasticsearch-xpack (7.17.11) elasticsearch-api (>= 6) - excon (0.111.0) - faraday (1.10.3) + excon (1.2.2) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -39,8 +39,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -60,8 +60,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-dedot_filter (1.0.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-elasticsearch (5.2.5) elasticsearch excon @@ -111,11 +111,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -126,20 +126,24 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) multipart-post (2.4.1) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -148,18 +152,20 @@ GEM rexml (3.2.9) strscan ruby2_keywords (0.0.5) - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-elasticsearch7/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push index 5f4424fec..3e1f1f9fa 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/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-elasticsearch7-arm64-1.2,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; do +for tag in {v1.16.6-debian-elasticsearch7-arm64-1.3,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; 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-elasticsearch8/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock index f23b61a25..214638136 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock @@ -9,25 +9,26 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) elastic-transport (8.3.5) faraday (< 3) multi_json - elasticsearch (8.15.0) + elasticsearch (8.17.0) elastic-transport (~> 8.3) - elasticsearch-api (= 8.15.0) - elasticsearch-api (8.15.0) + elasticsearch-api (= 8.17.0) + elasticsearch-api (8.17.0) multi_json - excon (0.111.0) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + excon (1.2.2) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-excon (2.1.0) - excon (>= 0.27.4) - faraday (~> 2.0) - faraday-net_http (3.3.0) - net-http + faraday-excon (2.3.0) + excon (>= 1.0.0) + faraday (>= 2.11.0, < 3) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) @@ -42,8 +43,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-dedot_filter (1.0.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-elasticsearch (5.3.0) elasticsearch excon @@ -94,11 +95,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -109,22 +110,25 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) - net-http (0.4.1) + net-http (0.6.0) uri netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -132,19 +136,21 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uri (0.13.1) - webrick (1.8.1) + uri (1.0.2) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-elasticsearch8/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push index 9e452d51f..63f834ba2 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/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-elasticsearch8-arm64-1.2,v1.16-debian-elasticsearch8-arm64-2}; do +for tag in {v1.16.6-debian-elasticsearch8-arm64-1.3,v1.16-debian-elasticsearch8-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-forward/Gemfile.lock b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock index ae33ce151..9195e7283 100644 --- a/docker-image/v1.16/arm64/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -69,11 +69,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -84,19 +84,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -104,18 +108,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-forward/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-forward/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-forward/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-forward/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-forward/hooks/post_push b/docker-image/v1.16/arm64/debian-forward/hooks/post_push index 568aa68a5..13db2248f 100644 --- a/docker-image/v1.16/arm64/debian-forward/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-forward/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-forward-arm64-1.2,v1.16-debian-forward-arm64-2}; do +for tag in {v1.16.6-debian-forward-arm64-1.3,v1.16-debian-forward-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-gcs/Gemfile.lock b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock index 50c19dea6..eb07e4be4 100644 --- a/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock @@ -9,16 +9,17 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-net_http (3.3.0) - net-http + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) @@ -31,8 +32,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-gcs (0.4.2) fluentd (>= 0.14.22, < 2) google-cloud-storage (~> 1.1) @@ -81,17 +82,17 @@ GEM mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - google-apis-iamcredentials_v1 (0.21.0) + google-apis-iamcredentials_v1 (0.22.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.44.0) + google-apis-storage_v1 (0.49.0) google-apis-core (>= 0.15.0, < 2.a) google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (2.2.0) + google-cloud-env (2.2.1) faraday (>= 1.0, < 3.a) google-cloud-errors (1.4.0) - google-cloud-storage (1.52.0) + google-cloud-storage (1.54.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-core (~> 0.13) @@ -100,9 +101,11 @@ GEM google-cloud-core (~> 1.6) googleauth (~> 1.9) mini_mime (~> 1.0) - googleauth (1.11.0) + google-logging-utils (0.1.0) + googleauth (1.12.2) faraday (>= 1.0, < 3.a) - google-cloud-env (~> 2.1) + google-cloud-env (~> 2.2) + google-logging-utils (~> 0.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) @@ -114,15 +117,15 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) httpclient (2.8.3) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json - jwt (2.8.2) + jwt (2.9.3) base64 kubeclient (4.12.0) http (>= 3.0, < 6.0) @@ -132,25 +135,28 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) + mime-types-data (3.2024.1203) mini_mime (1.1.5) - msgpack (1.7.2) + msgpack (1.7.5) multi_json (1.15.0) - mutex_m (0.2.0) - net-http (0.4.1) + mutex_m (0.3.0) + net-http (0.6.0) uri netrc (0.11.0) oj (3.15.1) os (1.1.4) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -163,7 +169,9 @@ GEM retriable (3.1.2) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) signet (0.19.0) @@ -172,7 +180,7 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) trailblazer-option (0.1.2) @@ -181,8 +189,8 @@ GEM tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uber (0.1.0) - uri (0.13.1) - webrick (1.8.1) + uri (1.0.2) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-gcs/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-gcs/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-gcs/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-gcs/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push b/docker-image/v1.16/arm64/debian-gcs/hooks/post_push index 52d8f5b59..979857e07 100644 --- a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-gcs/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-gcs-arm64-1.2,v1.16-debian-gcs-arm64-2}; do +for tag in {v1.16.6-debian-gcs-arm64-1.3,v1.16-debian-gcs-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-graylog/Gemfile.lock b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock index fcd0ede28..6500796de 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-gelf-hs (1.0.8) fluentd gelf (>= 2.0.0) @@ -74,11 +74,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -89,19 +89,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -109,18 +113,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-graylog/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-graylog/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-graylog/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-graylog/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push b/docker-image/v1.16/arm64/debian-graylog/hooks/post_push index d3b197c32..74fe0e7d7 100644 --- a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-graylog/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-graylog-arm64-1.2,v1.16-debian-graylog-arm64-2}; do +for tag in {v1.16.6-debian-graylog-arm64-1.3,v1.16-debian-graylog-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-kafka/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock index 2de8df3ae..606b432d4 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock @@ -11,7 +11,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) @@ -30,8 +30,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -83,11 +83,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -98,16 +98,19 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) ltsv (0.1.2) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - mini_portile2 (2.8.7) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + mini_portile2 (2.8.8) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) @@ -116,7 +119,8 @@ GEM ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -126,19 +130,21 @@ GEM strscan ruby-kafka (1.5.0) digest-crc - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) snappy (0.4.0) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-kafka/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-kafka/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-kafka/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-kafka/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" 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 3ef7ae251..0ea8ed508 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.2,v1.16-debian-kafka-arm64-2}; do +for tag in {v1.16.6-debian-kafka-arm64-1.3,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/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock index 2de8df3ae..606b432d4 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock @@ -11,7 +11,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) @@ -30,8 +30,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -83,11 +83,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -98,16 +98,19 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) ltsv (0.1.2) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - mini_portile2 (2.8.7) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + mini_portile2 (2.8.8) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) @@ -116,7 +119,8 @@ GEM ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -126,19 +130,21 @@ GEM strscan ruby-kafka (1.5.0) digest-crc - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) snappy (0.4.0) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-kafka2/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-kafka2/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-kafka2/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" 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 a23da9a06..de3cada00 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.2,v1.16-debian-kafka2-arm64-2}; do +for tag in {v1.16.6-debian-kafka2-arm64-1.3,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/arm64/debian-kinesis/Gemfile.lock b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock index 9abace9b2..51a96465a 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock @@ -4,19 +4,19 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-core (3.204.0) + aws-partitions (1.1026.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.78.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-firehose (1.85.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-kinesis (1.65.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-kinesis (1.71.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -24,7 +24,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -38,8 +38,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -82,7 +82,7 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-protobuf (3.25.4) + google-protobuf (3.25.5) http (5.2.0) addressable (~> 2.8) base64 (~> 0.1) @@ -90,12 +90,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -106,19 +106,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -126,18 +130,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-kinesis/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-kinesis/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-kinesis/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push b/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push index 7171a11bf..9997d53dc 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-kinesis/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-kinesis-arm64-1.2,v1.16-debian-kinesis-arm64-2}; do +for tag in {v1.16.6-debian-kinesis-arm64-1.3,v1.16-debian-kinesis-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-logentries/Gemfile.lock b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock index ae33ce151..9195e7283 100644 --- a/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -69,11 +69,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -84,19 +84,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -104,18 +108,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-logentries/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-logentries/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-logentries/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-logentries/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push b/docker-image/v1.16/arm64/debian-logentries/hooks/post_push index b300bec70..b47cc52db 100644 --- a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logentries/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-logentries-arm64-1.2,v1.16-debian-logentries-arm64-2}; do +for tag in {v1.16.6-debian-logentries-arm64-1.3,v1.16-debian-logentries-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-loggly/Gemfile.lock b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock index 9f4ef01c0..8ecd7b55c 100644 --- a/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -72,11 +72,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -87,20 +87,24 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) net-http-persistent (2.9.4) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -108,18 +112,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-loggly/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-loggly/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-loggly/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-loggly/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push b/docker-image/v1.16/arm64/debian-loggly/hooks/post_push index a591c4248..7a81173d0 100644 --- a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-loggly/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-loggly-arm64-1.2,v1.16-debian-loggly-arm64-2}; do +for tag in {v1.16.6-debian-loggly-arm64-1.3,v1.16-debian-loggly-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-logzio/Gemfile.lock b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock index a115977f1..4b704b795 100644 --- a/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock @@ -10,7 +10,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -24,8 +24,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -74,11 +74,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -89,21 +89,25 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) - net-http-persistent (4.0.4) + net-http-persistent (4.0.5) connection_pool (~> 2.2) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -111,18 +115,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-logzio/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-logzio/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-logzio/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-logzio/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push b/docker-image/v1.16/arm64/debian-logzio/hooks/post_push index 5ae483270..8233226b2 100644 --- a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logzio/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-logzio-arm64-1.2,v1.16-debian-logzio-arm64-2}; do +for tag in {v1.16.6-debian-logzio-arm64-1.3,v1.16-debian-logzio-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-opensearch/Gemfile.lock b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock index 9e505d549..303c6d67e 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock @@ -4,13 +4,13 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-core (3.204.0) + aws-partitions (1.1026.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -18,17 +18,18 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) - excon (0.111.0) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + excon (1.2.2) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-excon (2.1.0) - excon (>= 0.27.4) - faraday (~> 2.0) - faraday-net_http (3.3.0) - net-http + faraday-excon (2.3.0) + excon (>= 1.0.0) + faraday (>= 2.11.0, < 3) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) faraday (>= 2.0, < 3) @@ -44,8 +45,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -57,14 +58,14 @@ GEM lru_redux fluent-plugin-multi-format-parser (1.0.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-opensearch (1.1.4) + fluent-plugin-opensearch (1.1.5) aws-sdk-core (~> 3) excon faraday (>= 2.0.0) faraday-excon (>= 2.0.0) faraday_middleware-aws-sigv4 (~> 1.0.1) fluentd (>= 0.14.22) - opensearch-ruby + opensearch-ruby (>= 3.0.1) fluent-plugin-parser-cri (0.1.1) fluentd (>= 1) fluent-plugin-prometheus (2.1.0) @@ -98,12 +99,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -114,25 +115,28 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) - net-http (0.4.1) + net-http (0.6.0) uri netrc (0.11.0) oj (3.15.1) opensearch-ruby (3.4.0) faraday (>= 1.0, < 3) multi_json (>= 1.0) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -140,19 +144,21 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uri (0.13.1) - webrick (1.8.1) + uri (1.0.2) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-opensearch/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-opensearch/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-opensearch/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push b/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push index 38f1019c3..fb8dfd0cb 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-opensearch/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-opensearch-arm64-1.2,v1.16-debian-opensearch-arm64-2}; do +for tag in {v1.16.6-debian-opensearch-arm64-1.3,v1.16-debian-opensearch-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-papertrail/Gemfile.lock b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock index daa4c3625..0df2abeb4 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -26,8 +26,8 @@ GEM uuidtools (>= 2.1.5) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -75,11 +75,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -90,19 +90,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -110,11 +114,13 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) @@ -122,7 +128,7 @@ GEM tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uuidtools (2.2.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-papertrail/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-papertrail/conf/kubernetes.conf index cf7f9c536..875787b33 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-papertrail/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push b/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push index edff39ef1..7a7f4ebca 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-papertrail/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-papertrail-arm64-1.2,v1.16-debian-papertrail-arm64-2}; do +for tag in {v1.16.6-debian-papertrail-arm64-1.3,v1.16-debian-papertrail-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-s3/Gemfile.lock b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock index 12e6bd626..f6ddbfa9f 100644 --- a/docker-image/v1.16/arm64/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock @@ -4,23 +4,23 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-core (3.204.0) + aws-partitions (1.1026.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.90.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-kms (1.96.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.161.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-s3 (1.176.1) + aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-sqs (1.82.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-sqs (1.89.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -28,7 +28,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -42,8 +42,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -92,12 +92,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -108,19 +108,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -128,18 +132,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-s3/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-s3/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-s3/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-s3/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-s3/hooks/post_push b/docker-image/v1.16/arm64/debian-s3/hooks/post_push index a9bcac4f5..b0f7f9c12 100644 --- a/docker-image/v1.16/arm64/debian-s3/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-s3/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-s3-arm64-1.2,v1.16-debian-s3-arm64-2}; do +for tag in {v1.16.6-debian-s3-arm64-1.3,v1.16-debian-s3-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-syslog/Gemfile.lock b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock index 840d50a84..8e4fb7a3e 100644 --- a/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -72,11 +72,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -87,19 +87,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct remote_syslog_sender (1.2.2) syslog_protocol rest-client (2.1.0) @@ -109,11 +113,13 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) syslog_protocol (0.9.2) systemd-journal (2.0.0) ffi (~> 1.9) @@ -121,7 +127,7 @@ GEM concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-syslog/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-syslog/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-syslog/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-syslog/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push b/docker-image/v1.16/arm64/debian-syslog/hooks/post_push index b92c5b5d7..d0fb02a99 100644 --- a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-syslog/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-syslog-arm64-1.2,v1.16-debian-syslog-arm64-2}; do +for tag in {v1.16.6-debian-syslog-arm64-1.3,v1.16-debian-syslog-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-azureblob/Gemfile.lock b/docker-image/v1.16/debian-azureblob/Gemfile.lock index 9912c3ee4..674619835 100644 --- a/docker-image/v1.16/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/debian-azureblob/Gemfile.lock @@ -18,9 +18,9 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) - faraday (1.10.3) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -36,14 +36,14 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.0) + faraday_middleware (1.2.1) faraday (~> 1.0) ffi (1.17.0) ffi-compiler (1.3.2) @@ -60,8 +60,8 @@ GEM fluentd (>= 0.14.10, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -106,11 +106,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -121,27 +121,31 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - mini_portile2 (2.8.7) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + mini_portile2 (2.8.8) + msgpack (1.7.5) multi_json (1.15.0) multipart-post (2.4.1) - net-http-persistent (4.0.4) + net-http-persistent (4.0.5) connection_pool (~> 2.2) netrc (0.11.0) - nokogiri (1.16.7) + nokogiri (1.17.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) racc (1.8.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -150,18 +154,20 @@ GEM rexml (3.2.9) strscan ruby2_keywords (0.0.5) - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-azureblob/conf/kubernetes.conf b/docker-image/v1.16/debian-azureblob/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-azureblob/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-azureblob/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-azureblob/hooks/post_push b/docker-image/v1.16/debian-azureblob/hooks/post_push index 1ac63978c..614af1483 100644 --- a/docker-image/v1.16/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/debian-azureblob/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-azureblob-amd64-1.2,v1.16-debian-azureblob-amd64-2}; do +for tag in {v1.16.6-debian-azureblob-amd64-1.3,v1.16-debian-azureblob-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-cloudwatch/Gemfile.lock b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock index 71071dd89..19666e2b7 100644 --- a/docker-image/v1.16/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock @@ -4,16 +4,16 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-cloudwatchlogs (1.92.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-partitions (1.1026.0) + aws-sdk-cloudwatchlogs (1.105.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.204.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -21,7 +21,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -38,8 +38,8 @@ GEM fluentd (>= 1.8.0) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -84,12 +84,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -100,19 +100,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -120,18 +124,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-cloudwatch/conf/kubernetes.conf b/docker-image/v1.16/debian-cloudwatch/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-cloudwatch/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-cloudwatch/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/debian-cloudwatch/hooks/post_push index 181dfa701..0625b5ae4 100644 --- a/docker-image/v1.16/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/debian-cloudwatch/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-cloudwatch-amd64-1.2,v1.16-debian-cloudwatch-amd64-2}; do +for tag in {v1.16.6-debian-cloudwatch-amd64-1.3,v1.16-debian-cloudwatch-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-elasticsearch7/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock index 0aa571267..9d454aff7 100644 --- a/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) elasticsearch (7.17.11) elasticsearch-api (= 7.17.11) @@ -22,8 +22,8 @@ GEM multi_json elasticsearch-xpack (7.17.11) elasticsearch-api (>= 6) - excon (0.111.0) - faraday (1.10.3) + excon (1.2.2) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -39,8 +39,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -60,8 +60,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-dedot_filter (1.0.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-elasticsearch (5.2.5) elasticsearch excon @@ -111,11 +111,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -126,20 +126,24 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) multipart-post (2.4.1) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -148,18 +152,20 @@ GEM rexml (3.2.9) strscan ruby2_keywords (0.0.5) - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-elasticsearch7/conf/kubernetes.conf b/docker-image/v1.16/debian-elasticsearch7/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-elasticsearch7/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-elasticsearch7/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/debian-elasticsearch7/hooks/post_push index 69d7f8354..14b38ba22 100644 --- a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch7/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-elasticsearch7-amd64-1.2,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; do +for tag in {v1.16.6-debian-elasticsearch7-amd64-1.3,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; 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-elasticsearch8/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock index f23b61a25..214638136 100644 --- a/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock @@ -9,25 +9,26 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) elastic-transport (8.3.5) faraday (< 3) multi_json - elasticsearch (8.15.0) + elasticsearch (8.17.0) elastic-transport (~> 8.3) - elasticsearch-api (= 8.15.0) - elasticsearch-api (8.15.0) + elasticsearch-api (= 8.17.0) + elasticsearch-api (8.17.0) multi_json - excon (0.111.0) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + excon (1.2.2) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-excon (2.1.0) - excon (>= 0.27.4) - faraday (~> 2.0) - faraday-net_http (3.3.0) - net-http + faraday-excon (2.3.0) + excon (>= 1.0.0) + faraday (>= 2.11.0, < 3) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) @@ -42,8 +43,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-dedot_filter (1.0.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-elasticsearch (5.3.0) elasticsearch excon @@ -94,11 +95,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -109,22 +110,25 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) - net-http (0.4.1) + net-http (0.6.0) uri netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -132,19 +136,21 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uri (0.13.1) - webrick (1.8.1) + uri (1.0.2) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-elasticsearch8/conf/kubernetes.conf b/docker-image/v1.16/debian-elasticsearch8/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-elasticsearch8/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-elasticsearch8/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/debian-elasticsearch8/hooks/post_push index 5924eb30d..013b48d4b 100644 --- a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch8/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-elasticsearch8-amd64-1.2,v1.16-debian-elasticsearch8-amd64-2}; do +for tag in {v1.16.6-debian-elasticsearch8-amd64-1.3,v1.16-debian-elasticsearch8-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-forward/Gemfile.lock b/docker-image/v1.16/debian-forward/Gemfile.lock index ae33ce151..9195e7283 100644 --- a/docker-image/v1.16/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/debian-forward/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -69,11 +69,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -84,19 +84,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -104,18 +108,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-forward/conf/kubernetes.conf b/docker-image/v1.16/debian-forward/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-forward/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-forward/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-forward/hooks/post_push b/docker-image/v1.16/debian-forward/hooks/post_push index 71a83747d..cbe5d0874 100644 --- a/docker-image/v1.16/debian-forward/hooks/post_push +++ b/docker-image/v1.16/debian-forward/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-forward-amd64-1.2,v1.16-debian-forward-amd64-2}; do +for tag in {v1.16.6-debian-forward-amd64-1.3,v1.16-debian-forward-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-gcs/Gemfile.lock b/docker-image/v1.16/debian-gcs/Gemfile.lock index 50c19dea6..eb07e4be4 100644 --- a/docker-image/v1.16/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/debian-gcs/Gemfile.lock @@ -9,16 +9,17 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-net_http (3.3.0) - net-http + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) @@ -31,8 +32,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-gcs (0.4.2) fluentd (>= 0.14.22, < 2) google-cloud-storage (~> 1.1) @@ -81,17 +82,17 @@ GEM mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - google-apis-iamcredentials_v1 (0.21.0) + google-apis-iamcredentials_v1 (0.22.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.44.0) + google-apis-storage_v1 (0.49.0) google-apis-core (>= 0.15.0, < 2.a) google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (2.2.0) + google-cloud-env (2.2.1) faraday (>= 1.0, < 3.a) google-cloud-errors (1.4.0) - google-cloud-storage (1.52.0) + google-cloud-storage (1.54.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-core (~> 0.13) @@ -100,9 +101,11 @@ GEM google-cloud-core (~> 1.6) googleauth (~> 1.9) mini_mime (~> 1.0) - googleauth (1.11.0) + google-logging-utils (0.1.0) + googleauth (1.12.2) faraday (>= 1.0, < 3.a) - google-cloud-env (~> 2.1) + google-cloud-env (~> 2.2) + google-logging-utils (~> 0.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) @@ -114,15 +117,15 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) httpclient (2.8.3) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json - jwt (2.8.2) + jwt (2.9.3) base64 kubeclient (4.12.0) http (>= 3.0, < 6.0) @@ -132,25 +135,28 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) + mime-types-data (3.2024.1203) mini_mime (1.1.5) - msgpack (1.7.2) + msgpack (1.7.5) multi_json (1.15.0) - mutex_m (0.2.0) - net-http (0.4.1) + mutex_m (0.3.0) + net-http (0.6.0) uri netrc (0.11.0) oj (3.15.1) os (1.1.4) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -163,7 +169,9 @@ GEM retriable (3.1.2) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) signet (0.19.0) @@ -172,7 +180,7 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) trailblazer-option (0.1.2) @@ -181,8 +189,8 @@ GEM tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uber (0.1.0) - uri (0.13.1) - webrick (1.8.1) + uri (1.0.2) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-gcs/conf/kubernetes.conf b/docker-image/v1.16/debian-gcs/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-gcs/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-gcs/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-gcs/hooks/post_push b/docker-image/v1.16/debian-gcs/hooks/post_push index f36c4e765..522df8f4d 100644 --- a/docker-image/v1.16/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/debian-gcs/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-gcs-amd64-1.2,v1.16-debian-gcs-amd64-2}; do +for tag in {v1.16.6-debian-gcs-amd64-1.3,v1.16-debian-gcs-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-graylog/Gemfile.lock b/docker-image/v1.16/debian-graylog/Gemfile.lock index fcd0ede28..6500796de 100644 --- a/docker-image/v1.16/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/debian-graylog/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-gelf-hs (1.0.8) fluentd gelf (>= 2.0.0) @@ -74,11 +74,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -89,19 +89,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -109,18 +113,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-graylog/conf/kubernetes.conf b/docker-image/v1.16/debian-graylog/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-graylog/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-graylog/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-graylog/hooks/post_push b/docker-image/v1.16/debian-graylog/hooks/post_push index 890caf4ce..8a388e53c 100644 --- a/docker-image/v1.16/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/debian-graylog/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-graylog-amd64-1.2,v1.16-debian-graylog-amd64-2}; do +for tag in {v1.16.6-debian-graylog-amd64-1.3,v1.16-debian-graylog-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-kafka/Gemfile.lock b/docker-image/v1.16/debian-kafka/Gemfile.lock index 2de8df3ae..606b432d4 100644 --- a/docker-image/v1.16/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka/Gemfile.lock @@ -11,7 +11,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) @@ -30,8 +30,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -83,11 +83,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -98,16 +98,19 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) ltsv (0.1.2) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - mini_portile2 (2.8.7) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + mini_portile2 (2.8.8) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) @@ -116,7 +119,8 @@ GEM ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -126,19 +130,21 @@ GEM strscan ruby-kafka (1.5.0) digest-crc - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) snappy (0.4.0) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-kafka/conf/kubernetes.conf b/docker-image/v1.16/debian-kafka/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-kafka/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-kafka/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-kafka/hooks/post_push b/docker-image/v1.16/debian-kafka/hooks/post_push index 7665a8444..fe868f748 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.2,v1.16-debian-kafka-amd64-2}; do +for tag in {v1.16.6-debian-kafka-amd64-1.3,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/Gemfile.lock b/docker-image/v1.16/debian-kafka2/Gemfile.lock index 2de8df3ae..606b432d4 100644 --- a/docker-image/v1.16/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka2/Gemfile.lock @@ -11,7 +11,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) @@ -30,8 +30,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -83,11 +83,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -98,16 +98,19 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) ltsv (0.1.2) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - mini_portile2 (2.8.7) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + mini_portile2 (2.8.8) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) @@ -116,7 +119,8 @@ GEM ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -126,19 +130,21 @@ GEM strscan ruby-kafka (1.5.0) digest-crc - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) snappy (0.4.0) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-kafka2/conf/kubernetes.conf b/docker-image/v1.16/debian-kafka2/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-kafka2/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-kafka2/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-kafka2/hooks/post_push b/docker-image/v1.16/debian-kafka2/hooks/post_push index 3cde0e476..03241ba07 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.2,v1.16-debian-kafka2-amd64-2}; do +for tag in {v1.16.6-debian-kafka2-amd64-1.3,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 diff --git a/docker-image/v1.16/debian-kinesis/Gemfile.lock b/docker-image/v1.16/debian-kinesis/Gemfile.lock index 9abace9b2..51a96465a 100644 --- a/docker-image/v1.16/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/debian-kinesis/Gemfile.lock @@ -4,19 +4,19 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-core (3.204.0) + aws-partitions (1.1026.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.78.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-firehose (1.85.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-kinesis (1.65.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-kinesis (1.71.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -24,7 +24,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -38,8 +38,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -82,7 +82,7 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-protobuf (3.25.4) + google-protobuf (3.25.5) http (5.2.0) addressable (~> 2.8) base64 (~> 0.1) @@ -90,12 +90,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -106,19 +106,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -126,18 +130,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-kinesis/conf/kubernetes.conf b/docker-image/v1.16/debian-kinesis/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-kinesis/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-kinesis/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-kinesis/hooks/post_push b/docker-image/v1.16/debian-kinesis/hooks/post_push index 7757e66e3..9911d683e 100644 --- a/docker-image/v1.16/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/debian-kinesis/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-kinesis-amd64-1.2,v1.16-debian-kinesis-amd64-2}; do +for tag in {v1.16.6-debian-kinesis-amd64-1.3,v1.16-debian-kinesis-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-logentries/Gemfile.lock b/docker-image/v1.16/debian-logentries/Gemfile.lock index ae33ce151..9195e7283 100644 --- a/docker-image/v1.16/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/debian-logentries/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -69,11 +69,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -84,19 +84,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -104,18 +108,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-logentries/conf/kubernetes.conf b/docker-image/v1.16/debian-logentries/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-logentries/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-logentries/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-logentries/hooks/post_push b/docker-image/v1.16/debian-logentries/hooks/post_push index ab830b5fa..659e9fab8 100644 --- a/docker-image/v1.16/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/debian-logentries/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-logentries-amd64-1.2,v1.16-debian-logentries-amd64-2}; do +for tag in {v1.16.6-debian-logentries-amd64-1.3,v1.16-debian-logentries-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-loggly/Gemfile.lock b/docker-image/v1.16/debian-loggly/Gemfile.lock index 9f4ef01c0..8ecd7b55c 100644 --- a/docker-image/v1.16/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/debian-loggly/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -72,11 +72,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -87,20 +87,24 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) net-http-persistent (2.9.4) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -108,18 +112,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-loggly/conf/kubernetes.conf b/docker-image/v1.16/debian-loggly/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-loggly/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-loggly/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-loggly/hooks/post_push b/docker-image/v1.16/debian-loggly/hooks/post_push index 70ec7e62b..e9480f55b 100644 --- a/docker-image/v1.16/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/debian-loggly/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-loggly-amd64-1.2,v1.16-debian-loggly-amd64-2}; do +for tag in {v1.16.6-debian-loggly-amd64-1.3,v1.16-debian-loggly-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-logzio/Gemfile.lock b/docker-image/v1.16/debian-logzio/Gemfile.lock index a115977f1..4b704b795 100644 --- a/docker-image/v1.16/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/debian-logzio/Gemfile.lock @@ -10,7 +10,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -24,8 +24,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -74,11 +74,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -89,21 +89,25 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) - net-http-persistent (4.0.4) + net-http-persistent (4.0.5) connection_pool (~> 2.2) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -111,18 +115,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-logzio/conf/kubernetes.conf b/docker-image/v1.16/debian-logzio/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-logzio/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-logzio/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-logzio/hooks/post_push b/docker-image/v1.16/debian-logzio/hooks/post_push index 5c4299992..9bb6c094a 100644 --- a/docker-image/v1.16/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/debian-logzio/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-logzio-amd64-1.2,v1.16-debian-logzio-amd64-2}; do +for tag in {v1.16.6-debian-logzio-amd64-1.3,v1.16-debian-logzio-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-opensearch/Gemfile.lock b/docker-image/v1.16/debian-opensearch/Gemfile.lock index 9e505d549..303c6d67e 100644 --- a/docker-image/v1.16/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/debian-opensearch/Gemfile.lock @@ -4,13 +4,13 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-core (3.204.0) + aws-partitions (1.1026.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -18,17 +18,18 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) - excon (0.111.0) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + excon (1.2.2) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-excon (2.1.0) - excon (>= 0.27.4) - faraday (~> 2.0) - faraday-net_http (3.3.0) - net-http + faraday-excon (2.3.0) + excon (>= 1.0.0) + faraday (>= 2.11.0, < 3) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) faraday (>= 2.0, < 3) @@ -44,8 +45,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -57,14 +58,14 @@ GEM lru_redux fluent-plugin-multi-format-parser (1.0.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-opensearch (1.1.4) + fluent-plugin-opensearch (1.1.5) aws-sdk-core (~> 3) excon faraday (>= 2.0.0) faraday-excon (>= 2.0.0) faraday_middleware-aws-sigv4 (~> 1.0.1) fluentd (>= 0.14.22) - opensearch-ruby + opensearch-ruby (>= 3.0.1) fluent-plugin-parser-cri (0.1.1) fluentd (>= 1) fluent-plugin-prometheus (2.1.0) @@ -98,12 +99,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -114,25 +115,28 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) - net-http (0.4.1) + net-http (0.6.0) uri netrc (0.11.0) oj (3.15.1) opensearch-ruby (3.4.0) faraday (>= 1.0, < 3) multi_json (>= 1.0) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -140,19 +144,21 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uri (0.13.1) - webrick (1.8.1) + uri (1.0.2) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-opensearch/conf/kubernetes.conf b/docker-image/v1.16/debian-opensearch/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-opensearch/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-opensearch/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-opensearch/hooks/post_push b/docker-image/v1.16/debian-opensearch/hooks/post_push index e9dc27318..87ad883af 100644 --- a/docker-image/v1.16/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/debian-opensearch/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-opensearch-amd64-1.2,v1.16-debian-opensearch-amd64-2}; do +for tag in {v1.16.6-debian-opensearch-amd64-1.3,v1.16-debian-opensearch-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-papertrail/Gemfile.lock b/docker-image/v1.16/debian-papertrail/Gemfile.lock index daa4c3625..0df2abeb4 100644 --- a/docker-image/v1.16/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/debian-papertrail/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -26,8 +26,8 @@ GEM uuidtools (>= 2.1.5) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -75,11 +75,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -90,19 +90,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -110,11 +114,13 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) @@ -122,7 +128,7 @@ GEM tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uuidtools (2.2.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-papertrail/conf/kubernetes.conf b/docker-image/v1.16/debian-papertrail/conf/kubernetes.conf index cf7f9c536..875787b33 100644 --- a/docker-image/v1.16/debian-papertrail/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-papertrail/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-papertrail/hooks/post_push b/docker-image/v1.16/debian-papertrail/hooks/post_push index 6058188d8..25e3c251c 100644 --- a/docker-image/v1.16/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/debian-papertrail/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-papertrail-amd64-1.2,v1.16-debian-papertrail-amd64-2}; do +for tag in {v1.16.6-debian-papertrail-amd64-1.3,v1.16-debian-papertrail-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-s3/Gemfile.lock b/docker-image/v1.16/debian-s3/Gemfile.lock index 12e6bd626..f6ddbfa9f 100644 --- a/docker-image/v1.16/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/debian-s3/Gemfile.lock @@ -4,23 +4,23 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-core (3.204.0) + aws-partitions (1.1026.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.90.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-kms (1.96.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.161.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-s3 (1.176.1) + aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-sqs (1.82.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-sqs (1.89.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -28,7 +28,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -42,8 +42,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -92,12 +92,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -108,19 +108,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -128,18 +132,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-s3/conf/kubernetes.conf b/docker-image/v1.16/debian-s3/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-s3/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-s3/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-s3/hooks/post_push b/docker-image/v1.16/debian-s3/hooks/post_push index e1e33863d..faa0e409d 100644 --- a/docker-image/v1.16/debian-s3/hooks/post_push +++ b/docker-image/v1.16/debian-s3/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-s3-amd64-1.2,v1.16-debian-s3-amd64-2}; do +for tag in {v1.16.6-debian-s3-amd64-1.3,v1.16-debian-s3-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-syslog/Gemfile.lock b/docker-image/v1.16/debian-syslog/Gemfile.lock index 840d50a84..8e4fb7a3e 100644 --- a/docker-image/v1.16/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/debian-syslog/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -72,11 +72,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -87,19 +87,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct remote_syslog_sender (1.2.2) syslog_protocol rest-client (2.1.0) @@ -109,11 +113,13 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) syslog_protocol (0.9.2) systemd-journal (2.0.0) ffi (~> 1.9) @@ -121,7 +127,7 @@ GEM concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-syslog/conf/kubernetes.conf b/docker-image/v1.16/debian-syslog/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-syslog/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-syslog/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-syslog/hooks/post_push b/docker-image/v1.16/debian-syslog/hooks/post_push index 4f1345808..db31094d5 100644 --- a/docker-image/v1.16/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/debian-syslog/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-syslog-amd64-1.2,v1.16-debian-syslog-amd64-2}; do +for tag in {v1.16.6-debian-syslog-amd64-1.3,v1.16-debian-syslog-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