From 75853587291b857a32f5161b9aa61767f7cd71b3 Mon Sep 17 00:00:00 2001 From: Adrian Manikowski Date: Wed, 31 Jan 2024 10:45:58 +0000 Subject: [PATCH 1/2] [fluentd] Docker images updates - 2024-01-31-104558 --- 1/debian11/1.16/Dockerfile | 4 ++-- versions.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/1/debian11/1.16/Dockerfile b/1/debian11/1.16/Dockerfile index ac9dfc9..f7e5f04 100644 --- a/1/debian11/1.16/Dockerfile +++ b/1/debian11/1.16/Dockerfile @@ -24,12 +24,12 @@ FROM marketplace.gcr.io/google/c2d-debian11 ARG DEBIAN_FRONTEND=noninteractive -ENV FLUENTD_VERSION 1.16.2 +ENV FLUENTD_VERSION 1.16.3 ENV RUBY_VERSION 2.7.0 ENV RUBY_GPG 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB ENV RVM_SHA256 7bbf79be95e516f72945e558a4290b40ff8714158140a00991d42172ff78e209 -ENV C2D_RELEASE=1.16.2 +ENV C2D_RELEASE=1.16.3 COPY Gemfile.conf /Gemfile.conf diff --git a/versions.yaml b/versions.yaml index c328466..4cb66d2 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ versions: from: marketplace.gcr.io/google/c2d-debian11 packages: fluentd: - version: 1.16.2 + version: 1.16.3 ruby: gpg: 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB version: 2.7.0 @@ -28,10 +28,10 @@ versions: sha256: 7bbf79be95e516f72945e558a4290b40ff8714158140a00991d42172ff78e209 repo: fluentd1 tags: - - 1.16.2-debian11 + - 1.16.3-debian11 - 1.16-debian11 - 1-debian11 - - 1.16.2 + - 1.16.3 - '1.16' - '1' - latest From c36a1282c1a133a8c08616d135f2fac11a442e6b Mon Sep 17 00:00:00 2001 From: Adrian Manikowski Date: Mon, 25 Mar 2024 10:07:21 +0000 Subject: [PATCH 2/2] ruby updated --- 1/debian11/1.13/Dockerfile | 2 +- 1/debian11/1.16/Dockerfile | 2 +- versions.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/1/debian11/1.13/Dockerfile b/1/debian11/1.13/Dockerfile index 4a66962..21ac0b5 100644 --- a/1/debian11/1.13/Dockerfile +++ b/1/debian11/1.13/Dockerfile @@ -25,7 +25,7 @@ FROM marketplace.gcr.io/google/c2d-debian11 ARG DEBIAN_FRONTEND=noninteractive ENV FLUENTD_VERSION 1.13.3 -ENV RUBY_VERSION 2.7.0 +ENV RUBY_VERSION 3.0.0 ENV RUBY_GPG 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB ENV RVM_SHA256 7bbf79be95e516f72945e558a4290b40ff8714158140a00991d42172ff78e209 diff --git a/1/debian11/1.16/Dockerfile b/1/debian11/1.16/Dockerfile index f7e5f04..14d0fd4 100644 --- a/1/debian11/1.16/Dockerfile +++ b/1/debian11/1.16/Dockerfile @@ -25,7 +25,7 @@ FROM marketplace.gcr.io/google/c2d-debian11 ARG DEBIAN_FRONTEND=noninteractive ENV FLUENTD_VERSION 1.16.3 -ENV RUBY_VERSION 2.7.0 +ENV RUBY_VERSION 3.0.0 ENV RUBY_GPG 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB ENV RVM_SHA256 7bbf79be95e516f72945e558a4290b40ff8714158140a00991d42172ff78e209 diff --git a/versions.yaml b/versions.yaml index 4cb66d2..d01ca16 100644 --- a/versions.yaml +++ b/versions.yaml @@ -23,7 +23,7 @@ versions: version: 1.16.3 ruby: gpg: 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB - version: 2.7.0 + version: 3.0.0 rvm: sha256: 7bbf79be95e516f72945e558a4290b40ff8714158140a00991d42172ff78e209 repo: fluentd1 @@ -42,7 +42,7 @@ versions: version: 1.13.3 ruby: gpg: 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB - version: 2.7.0 + version: 3.0.0 rvm: sha256: 7bbf79be95e516f72945e558a4290b40ff8714158140a00991d42172ff78e209 repo: fluentd1