Skip to content

Commit f14502b

Browse files
kenhyskenhys
authored
Add v1.19 images (#1583)
* Update to v1.19.0 * Also bump Ruby to 3.4 * Update bundled gems as much as possible * Update SECURITY policy * Update base container to trixie (derived from fluentd-docker-image) Signed-off-by: Kentaro Hayashi <[email protected]> * Add v1.19.0 images Signed-off-by: Kentaro Hayashi <[email protected]> * kafka,kafka2: drop needless SASL check rdkafka x86_64-linux-gnu gem bundles statically linked SASL. Signed-off-by: Kentaro Hayashi <[email protected]> * Update Dockerfiles Signed-off-by: Kentaro Hayashi <[email protected]> --------- Signed-off-by: Kentaro Hayashi <[email protected]>
1 parent 1564a1d commit f14502b

File tree

943 files changed

+26911
-230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

943 files changed

+26911
-230
lines changed

‎.github/dependabot.yml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,238 +14,238 @@ updates:
1414

1515

1616
- package-ecosystem: "bundler"
17-
directory: "/docker-image/v1.18/arm64/debian-azureblob"
17+
directory: "/docker-image/v1.19/arm64/debian-azureblob"
1818
schedule:
1919
interval: "daily"
2020
open-pull-requests-limit: 0
2121

2222

2323
- package-ecosystem: "bundler"
24-
directory: "/docker-image/v1.18/arm64/debian-cloudwatch"
24+
directory: "/docker-image/v1.19/arm64/debian-cloudwatch"
2525
schedule:
2626
interval: "daily"
2727
open-pull-requests-limit: 0
2828

2929

3030
- package-ecosystem: "bundler"
31-
directory: "/docker-image/v1.18/arm64/debian-elasticsearch7"
31+
directory: "/docker-image/v1.19/arm64/debian-elasticsearch7"
3232
schedule:
3333
interval: "daily"
3434
open-pull-requests-limit: 0
3535

3636

3737
- package-ecosystem: "bundler"
38-
directory: "/docker-image/v1.18/arm64/debian-elasticsearch8"
38+
directory: "/docker-image/v1.19/arm64/debian-elasticsearch8"
3939
schedule:
4040
interval: "daily"
4141
open-pull-requests-limit: 0
4242

4343

4444
- package-ecosystem: "bundler"
45-
directory: "/docker-image/v1.18/arm64/debian-forward"
45+
directory: "/docker-image/v1.19/arm64/debian-forward"
4646
schedule:
4747
interval: "daily"
4848
open-pull-requests-limit: 0
4949

5050

5151
- package-ecosystem: "bundler"
52-
directory: "/docker-image/v1.18/arm64/debian-gcs"
52+
directory: "/docker-image/v1.19/arm64/debian-gcs"
5353
schedule:
5454
interval: "daily"
5555
open-pull-requests-limit: 0
5656

5757

5858
- package-ecosystem: "bundler"
59-
directory: "/docker-image/v1.18/arm64/debian-graylog"
59+
directory: "/docker-image/v1.19/arm64/debian-graylog"
6060
schedule:
6161
interval: "daily"
6262
open-pull-requests-limit: 0
6363

6464

6565
- package-ecosystem: "bundler"
66-
directory: "/docker-image/v1.18/arm64/debian-kafka"
66+
directory: "/docker-image/v1.19/arm64/debian-kafka"
6767
schedule:
6868
interval: "daily"
6969
open-pull-requests-limit: 0
7070

7171

7272
- package-ecosystem: "bundler"
73-
directory: "/docker-image/v1.18/arm64/debian-kafka2"
73+
directory: "/docker-image/v1.19/arm64/debian-kafka2"
7474
schedule:
7575
interval: "daily"
7676
open-pull-requests-limit: 0
7777

7878

7979
- package-ecosystem: "bundler"
80-
directory: "/docker-image/v1.18/arm64/debian-kinesis"
80+
directory: "/docker-image/v1.19/arm64/debian-kinesis"
8181
schedule:
8282
interval: "daily"
8383
open-pull-requests-limit: 0
8484

8585

8686
- package-ecosystem: "bundler"
87-
directory: "/docker-image/v1.18/arm64/debian-logentries"
87+
directory: "/docker-image/v1.19/arm64/debian-logentries"
8888
schedule:
8989
interval: "daily"
9090
open-pull-requests-limit: 0
9191

9292

9393
- package-ecosystem: "bundler"
94-
directory: "/docker-image/v1.18/arm64/debian-loggly"
94+
directory: "/docker-image/v1.19/arm64/debian-loggly"
9595
schedule:
9696
interval: "daily"
9797
open-pull-requests-limit: 0
9898

9999

100100
- package-ecosystem: "bundler"
101-
directory: "/docker-image/v1.18/arm64/debian-logzio"
101+
directory: "/docker-image/v1.19/arm64/debian-logzio"
102102
schedule:
103103
interval: "daily"
104104
open-pull-requests-limit: 0
105105

106106

107107
- package-ecosystem: "bundler"
108-
directory: "/docker-image/v1.18/arm64/debian-opensearch"
108+
directory: "/docker-image/v1.19/arm64/debian-opensearch"
109109
schedule:
110110
interval: "daily"
111111
open-pull-requests-limit: 0
112112

113113

114114
- package-ecosystem: "bundler"
115-
directory: "/docker-image/v1.18/arm64/debian-papertrail"
115+
directory: "/docker-image/v1.19/arm64/debian-papertrail"
116116
schedule:
117117
interval: "daily"
118118
open-pull-requests-limit: 0
119119

120120

121121
- package-ecosystem: "bundler"
122-
directory: "/docker-image/v1.18/arm64/debian-s3"
122+
directory: "/docker-image/v1.19/arm64/debian-s3"
123123
schedule:
124124
interval: "daily"
125125
open-pull-requests-limit: 0
126126

127127

128128
- package-ecosystem: "bundler"
129-
directory: "/docker-image/v1.18/arm64/debian-syslog"
129+
directory: "/docker-image/v1.19/arm64/debian-syslog"
130130
schedule:
131131
interval: "daily"
132132
open-pull-requests-limit: 0
133133

134134

135135
- package-ecosystem: "bundler"
136-
directory: "/docker-image/v1.18/debian-azureblob"
136+
directory: "/docker-image/v1.19/debian-azureblob"
137137
schedule:
138138
interval: "daily"
139139
open-pull-requests-limit: 0
140140

141141

142142
- package-ecosystem: "bundler"
143-
directory: "/docker-image/v1.18/debian-cloudwatch"
143+
directory: "/docker-image/v1.19/debian-cloudwatch"
144144
schedule:
145145
interval: "daily"
146146
open-pull-requests-limit: 0
147147

148148

149149
- package-ecosystem: "bundler"
150-
directory: "/docker-image/v1.18/debian-elasticsearch7"
150+
directory: "/docker-image/v1.19/debian-elasticsearch7"
151151
schedule:
152152
interval: "daily"
153153
open-pull-requests-limit: 0
154154

155155

156156
- package-ecosystem: "bundler"
157-
directory: "/docker-image/v1.18/debian-elasticsearch8"
157+
directory: "/docker-image/v1.19/debian-elasticsearch8"
158158
schedule:
159159
interval: "daily"
160160
open-pull-requests-limit: 0
161161

162162

163163
- package-ecosystem: "bundler"
164-
directory: "/docker-image/v1.18/debian-forward"
164+
directory: "/docker-image/v1.19/debian-forward"
165165
schedule:
166166
interval: "daily"
167167
open-pull-requests-limit: 0
168168

169169

170170
- package-ecosystem: "bundler"
171-
directory: "/docker-image/v1.18/debian-gcs"
171+
directory: "/docker-image/v1.19/debian-gcs"
172172
schedule:
173173
interval: "daily"
174174
open-pull-requests-limit: 0
175175

176176

177177
- package-ecosystem: "bundler"
178-
directory: "/docker-image/v1.18/debian-graylog"
178+
directory: "/docker-image/v1.19/debian-graylog"
179179
schedule:
180180
interval: "daily"
181181
open-pull-requests-limit: 0
182182

183183

184184
- package-ecosystem: "bundler"
185-
directory: "/docker-image/v1.18/debian-kafka"
185+
directory: "/docker-image/v1.19/debian-kafka"
186186
schedule:
187187
interval: "daily"
188188
open-pull-requests-limit: 0
189189

190190

191191
- package-ecosystem: "bundler"
192-
directory: "/docker-image/v1.18/debian-kafka2"
192+
directory: "/docker-image/v1.19/debian-kafka2"
193193
schedule:
194194
interval: "daily"
195195
open-pull-requests-limit: 0
196196

197197

198198
- package-ecosystem: "bundler"
199-
directory: "/docker-image/v1.18/debian-kinesis"
199+
directory: "/docker-image/v1.19/debian-kinesis"
200200
schedule:
201201
interval: "daily"
202202
open-pull-requests-limit: 0
203203

204204

205205
- package-ecosystem: "bundler"
206-
directory: "/docker-image/v1.18/debian-logentries"
206+
directory: "/docker-image/v1.19/debian-logentries"
207207
schedule:
208208
interval: "daily"
209209
open-pull-requests-limit: 0
210210

211211

212212
- package-ecosystem: "bundler"
213-
directory: "/docker-image/v1.18/debian-loggly"
213+
directory: "/docker-image/v1.19/debian-loggly"
214214
schedule:
215215
interval: "daily"
216216
open-pull-requests-limit: 0
217217

218218

219219
- package-ecosystem: "bundler"
220-
directory: "/docker-image/v1.18/debian-logzio"
220+
directory: "/docker-image/v1.19/debian-logzio"
221221
schedule:
222222
interval: "daily"
223223
open-pull-requests-limit: 0
224224

225225

226226
- package-ecosystem: "bundler"
227-
directory: "/docker-image/v1.18/debian-opensearch"
227+
directory: "/docker-image/v1.19/debian-opensearch"
228228
schedule:
229229
interval: "daily"
230230
open-pull-requests-limit: 0
231231

232232

233233
- package-ecosystem: "bundler"
234-
directory: "/docker-image/v1.18/debian-papertrail"
234+
directory: "/docker-image/v1.19/debian-papertrail"
235235
schedule:
236236
interval: "daily"
237237
open-pull-requests-limit: 0
238238

239239

240240
- package-ecosystem: "bundler"
241-
directory: "/docker-image/v1.18/debian-s3"
241+
directory: "/docker-image/v1.19/debian-s3"
242242
schedule:
243243
interval: "daily"
244244
open-pull-requests-limit: 0
245245

246246

247247
- package-ecosystem: "bundler"
248-
directory: "/docker-image/v1.18/debian-syslog"
248+
directory: "/docker-image/v1.19/debian-syslog"
249249
schedule:
250250
interval: "daily"
251251
open-pull-requests-limit: 0

‎Makefile‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,44 @@
88

99
IMAGE_NAME := fluent/fluentd-kubernetes
1010
X86_IMAGES := \
11-
v1.18/debian-azureblob:v1.18.0-debian-azureblob-amd64-1.5,v1.18-debian-azureblob-amd64-1 \
12-
v1.18/debian-elasticsearch8:v1.18.0-debian-elasticsearch8-amd64-1.5,v1.18-debian-elasticsearch8-amd64-1 \
13-
v1.18/debian-elasticsearch7:v1.18.0-debian-elasticsearch7-amd64-1.5,v1.18-debian-elasticsearch7-amd64-1,v1-debian-elasticsearch-amd64 \
14-
v1.18/debian-opensearch:v1.18.0-debian-opensearch-amd64-1.5,v1.18-debian-opensearch-amd64-1 \
15-
v1.18/debian-loggly:v1.18.0-debian-loggly-amd64-1.5,v1.18-debian-loggly-amd64-1 \
16-
v1.18/debian-logentries:v1.18.0-debian-logentries-amd64-1.5,v1.18-debian-logentries-amd64-1 \
17-
v1.18/debian-cloudwatch:v1.18.0-debian-cloudwatch-amd64-1.5,v1.18-debian-cloudwatch-amd64-1 \
18-
v1.18/debian-s3:v1.18.0-debian-s3-amd64-1.5,v1.18-debian-s3-amd64-1 \
19-
v1.18/debian-syslog:v1.18.0-debian-syslog-amd64-1.5,v1.18-debian-syslog-amd64-1 \
20-
v1.18/debian-forward:v1.18.0-debian-forward-amd64-1.5,v1.18-debian-forward-amd64-1 \
21-
v1.18/debian-gcs:v1.18.0-debian-gcs-amd64-1.5,v1.18-debian-gcs-amd64-1 \
22-
v1.18/debian-graylog:v1.18.0-debian-graylog-amd64-1.5,v1.18-debian-graylog-amd64-1 \
23-
v1.18/debian-papertrail:v1.18.0-debian-papertrail-amd64-1.5,v1.18-debian-papertrail-amd64-1 \
24-
v1.18/debian-logzio:v1.18.0-debian-logzio-amd64-1.5,v1.18-debian-logzio-amd64-1 \
25-
v1.18/debian-kafka:v1.18.0-debian-kafka-amd64-1.5,v1.18-debian-kafka-amd64-1 \
26-
v1.18/debian-kafka2:v1.18.0-debian-kafka2-amd64-1.5,v1.18-debian-kafka2-amd64-1 \
27-
v1.18/debian-kinesis:v1.18.0-debian-kinesis-amd64-1.5,v1.18-debian-kinesis-amd64-1
11+
v1.19/debian-azureblob:v1.19.0-debian-azureblob-amd64-1.0,v1.19-debian-azureblob-amd64-1 \
12+
v1.19/debian-elasticsearch8:v1.19.0-debian-elasticsearch8-amd64-1.0,v1.19-debian-elasticsearch8-amd64-1 \
13+
v1.19/debian-elasticsearch7:v1.19.0-debian-elasticsearch7-amd64-1.0,v1.19-debian-elasticsearch7-amd64-1,v1-debian-elasticsearch-amd64 \
14+
v1.19/debian-opensearch:v1.19.0-debian-opensearch-amd64-1.0,v1.19-debian-opensearch-amd64-1 \
15+
v1.19/debian-loggly:v1.19.0-debian-loggly-amd64-1.0,v1.19-debian-loggly-amd64-1 \
16+
v1.19/debian-logentries:v1.19.0-debian-logentries-amd64-1.0,v1.19-debian-logentries-amd64-1 \
17+
v1.19/debian-cloudwatch:v1.19.0-debian-cloudwatch-amd64-1.0,v1.19-debian-cloudwatch-amd64-1 \
18+
v1.19/debian-s3:v1.19.0-debian-s3-amd64-1.0,v1.19-debian-s3-amd64-1 \
19+
v1.19/debian-syslog:v1.19.0-debian-syslog-amd64-1.0,v1.19-debian-syslog-amd64-1 \
20+
v1.19/debian-forward:v1.19.0-debian-forward-amd64-1.0,v1.19-debian-forward-amd64-1 \
21+
v1.19/debian-gcs:v1.19.0-debian-gcs-amd64-1.0,v1.19-debian-gcs-amd64-1 \
22+
v1.19/debian-graylog:v1.19.0-debian-graylog-amd64-1.0,v1.19-debian-graylog-amd64-1 \
23+
v1.19/debian-papertrail:v1.19.0-debian-papertrail-amd64-1.0,v1.19-debian-papertrail-amd64-1 \
24+
v1.19/debian-logzio:v1.19.0-debian-logzio-amd64-1.0,v1.19-debian-logzio-amd64-1 \
25+
v1.19/debian-kafka:v1.19.0-debian-kafka-amd64-1.0,v1.19-debian-kafka-amd64-1 \
26+
v1.19/debian-kafka2:v1.19.0-debian-kafka2-amd64-1.0,v1.19-debian-kafka2-amd64-1 \
27+
v1.19/debian-kinesis:v1.19.0-debian-kinesis-amd64-1.0,v1.19-debian-kinesis-amd64-1
2828

2929
# <Dockerfile>:<version>,<tag1>,<tag2>,...
3030

3131
ARM64_IMAGES := \
32-
v1.18/arm64/debian-azureblob:v1.18.0-debian-azureblob-arm64-1.5,v1.18-debian-azureblob-arm64-1 \
33-
v1.18/arm64/debian-elasticsearch8:v1.18.0-debian-elasticsearch8-arm64-1.5,v1.18-debian-elasticsearch8-arm64-1 \
34-
v1.18/arm64/debian-elasticsearch7:v1.18.0-debian-elasticsearch7-arm64-1.5,v1.18-debian-elasticsearch7-arm64-1,v1-debian-elasticsearch-arm64 \
35-
v1.18/arm64/debian-opensearch:v1.18.0-debian-opensearch-arm64-1.5,v1.18-debian-opensearch-arm64-1 \
36-
v1.18/arm64/debian-loggly:v1.18.0-debian-loggly-arm64-1.5,v1.18-debian-loggly-arm64-1 \
37-
v1.18/arm64/debian-logentries:v1.18.0-debian-logentries-arm64-1.5,v1.18-debian-logentries-arm64-1 \
38-
v1.18/arm64/debian-cloudwatch:v1.18.0-debian-cloudwatch-arm64-1.5,v1.18-debian-cloudwatch-arm64-1 \
39-
v1.18/arm64/debian-s3:v1.18.0-debian-s3-arm64-1.5,v1.18-debian-s3-arm64-1 \
40-
v1.18/arm64/debian-syslog:v1.18.0-debian-syslog-arm64-1.5,v1.18-debian-syslog-arm64-1 \
41-
v1.18/arm64/debian-forward:v1.18.0-debian-forward-arm64-1.5,v1.18-debian-forward-arm64-1 \
42-
v1.18/arm64/debian-gcs:v1.18.0-debian-gcs-arm64-1.5,v1.18-debian-gcs-arm64-1 \
43-
v1.18/arm64/debian-graylog:v1.18.0-debian-graylog-arm64-1.5,v1.18-debian-graylog-arm64-1 \
44-
v1.18/arm64/debian-papertrail:v1.18.0-debian-papertrail-arm64-1.5,v1.18-debian-papertrail-arm64-1 \
45-
v1.18/arm64/debian-logzio:v1.18.0-debian-logzio-arm64-1.5,v1.18-debian-logzio-arm64-1 \
46-
v1.18/arm64/debian-kafka:v1.18.0-debian-kafka-arm64-1.5,v1.18-debian-kafka-arm64-1 \
47-
v1.18/arm64/debian-kafka2:v1.18.0-debian-kafka2-arm64-1.5,v1.18-debian-kafka2-arm64-1 \
48-
v1.18/arm64/debian-kinesis:v1.18.0-debian-kinesis-arm64-1.5,v1.18-debian-kinesis-arm64-1
32+
v1.19/arm64/debian-azureblob:v1.19.0-debian-azureblob-arm64-1.0,v1.19-debian-azureblob-arm64-1 \
33+
v1.19/arm64/debian-elasticsearch8:v1.19.0-debian-elasticsearch8-arm64-1.0,v1.19-debian-elasticsearch8-arm64-1 \
34+
v1.19/arm64/debian-elasticsearch7:v1.19.0-debian-elasticsearch7-arm64-1.0,v1.19-debian-elasticsearch7-arm64-1,v1-debian-elasticsearch-arm64 \
35+
v1.19/arm64/debian-opensearch:v1.19.0-debian-opensearch-arm64-1.0,v1.19-debian-opensearch-arm64-1 \
36+
v1.19/arm64/debian-loggly:v1.19.0-debian-loggly-arm64-1.0,v1.19-debian-loggly-arm64-1 \
37+
v1.19/arm64/debian-logentries:v1.19.0-debian-logentries-arm64-1.0,v1.19-debian-logentries-arm64-1 \
38+
v1.19/arm64/debian-cloudwatch:v1.19.0-debian-cloudwatch-arm64-1.0,v1.19-debian-cloudwatch-arm64-1 \
39+
v1.19/arm64/debian-s3:v1.19.0-debian-s3-arm64-1.0,v1.19-debian-s3-arm64-1 \
40+
v1.19/arm64/debian-syslog:v1.19.0-debian-syslog-arm64-1.0,v1.19-debian-syslog-arm64-1 \
41+
v1.19/arm64/debian-forward:v1.19.0-debian-forward-arm64-1.0,v1.19-debian-forward-arm64-1 \
42+
v1.19/arm64/debian-gcs:v1.19.0-debian-gcs-arm64-1.0,v1.19-debian-gcs-arm64-1 \
43+
v1.19/arm64/debian-graylog:v1.19.0-debian-graylog-arm64-1.0,v1.19-debian-graylog-arm64-1 \
44+
v1.19/arm64/debian-papertrail:v1.19.0-debian-papertrail-arm64-1.0,v1.19-debian-papertrail-arm64-1 \
45+
v1.19/arm64/debian-logzio:v1.19.0-debian-logzio-arm64-1.0,v1.19-debian-logzio-arm64-1 \
46+
v1.19/arm64/debian-kafka:v1.19.0-debian-kafka-arm64-1.0,v1.19-debian-kafka-arm64-1 \
47+
v1.19/arm64/debian-kafka2:v1.19.0-debian-kafka2-arm64-1.0,v1.19-debian-kafka2-arm64-1 \
48+
v1.19/arm64/debian-kinesis:v1.19.0-debian-kinesis-arm64-1.0,v1.19-debian-kinesis-arm64-1
4949

5050
ALL_IMAGES := $(X86_IMAGES) $(ARM64_IMAGES)
5151

@@ -57,7 +57,7 @@ space := $(empty) $(empty)
5757
DOCKERFILE ?= $(word 1,$(subst :, ,$(word 1,$(ALL_IMAGES))))
5858
TARGET ?= $(word 2,$(subst -, , $(DOCKERFILE)))
5959

60-
RUBY_VERSION = 3.2
60+
RUBY_VERSION = 3.4
6161

6262
# Gets the version value based on the directory the dockerfile is in.
6363
FLUENTD_VERSION ?= $(word 1,$(subst /, ,$(DOCKERFILE)))

0 commit comments

Comments
 (0)