Skip to content

Commit

Permalink
Bump version to v1.17.1-1.2
Browse files Browse the repository at this point in the history 
Follow v1.17.1-1.1

Signed-off-by: Kentaro Hayashi <[email protected]>
  • Loading branch information
@kenhys
kenhys committed Oct 29, 2024
1 parent 0c74cd2 commit e79ae02
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 36 deletions.
68 changes: 34 additions & 34 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,44 +12,44 @@

IMAGE_NAME := fluent/fluentd-kubernetes
X86_IMAGES := \
v1.17/debian-azureblob:v1.17.1-debian-azureblob-amd64-1.1,v1.17-debian-azureblob-amd64-1 \
v1.17/debian-elasticsearch8:v1.17.1-debian-elasticsearch8-amd64-1.1,v1.17-debian-elasticsearch8-amd64-1 \
v1.17/debian-elasticsearch7:v1.17.1-debian-elasticsearch7-amd64-1.1,v1.17-debian-elasticsearch7-amd64-1,v1-debian-elasticsearch-amd64 \
v1.17/debian-opensearch:v1.17.1-debian-opensearch-amd64-1.1,v1.17-debian-opensearch-amd64-1 \
v1.17/debian-loggly:v1.17.1-debian-loggly-amd64-1.1,v1.17-debian-loggly-amd64-1 \
v1.17/debian-logentries:v1.17.1-debian-logentries-amd64-1.1,v1.17-debian-logentries-amd64-1 \
v1.17/debian-cloudwatch:v1.17.1-debian-cloudwatch-amd64-1.1,v1.17-debian-cloudwatch-amd64-1 \
v1.17/debian-s3:v1.17.1-debian-s3-amd64-1.1,v1.17-debian-s3-amd64-1 \
v1.17/debian-syslog:v1.17.1-debian-syslog-amd64-1.1,v1.17-debian-syslog-amd64-1 \
v1.17/debian-forward:v1.17.1-debian-forward-amd64-1.1,v1.17-debian-forward-amd64-1 \
v1.17/debian-gcs:v1.17.1-debian-gcs-amd64-1.1,v1.17-debian-gcs-amd64-1 \
v1.17/debian-graylog:v1.17.1-debian-graylog-amd64-1.1,v1.17-debian-graylog-amd64-1 \
v1.17/debian-papertrail:v1.17.1-debian-papertrail-amd64-1.1,v1.17-debian-papertrail-amd64-1 \
v1.17/debian-logzio:v1.17.1-debian-logzio-amd64-1.1,v1.17-debian-logzio-amd64-1 \
v1.17/debian-kafka:v1.17.1-debian-kafka-amd64-1.1,v1.17-debian-kafka-amd64-1 \
v1.17/debian-kafka2:v1.17.1-debian-kafka2-amd64-1.1,v1.17-debian-kafka2-amd64-1 \
v1.17/debian-kinesis:v1.17.1-debian-kinesis-amd64-1.1,v1.17-debian-kinesis-amd64-1
v1.17/debian-azureblob:v1.17.1-debian-azureblob-amd64-1.2,v1.17-debian-azureblob-amd64-1 \
v1.17/debian-elasticsearch8:v1.17.1-debian-elasticsearch8-amd64-1.2,v1.17-debian-elasticsearch8-amd64-1 \
v1.17/debian-elasticsearch7:v1.17.1-debian-elasticsearch7-amd64-1.2,v1.17-debian-elasticsearch7-amd64-1,v1-debian-elasticsearch-amd64 \
v1.17/debian-opensearch:v1.17.1-debian-opensearch-amd64-1.2,v1.17-debian-opensearch-amd64-1 \
v1.17/debian-loggly:v1.17.1-debian-loggly-amd64-1.2,v1.17-debian-loggly-amd64-1 \
v1.17/debian-logentries:v1.17.1-debian-logentries-amd64-1.2,v1.17-debian-logentries-amd64-1 \
v1.17/debian-cloudwatch:v1.17.1-debian-cloudwatch-amd64-1.2,v1.17-debian-cloudwatch-amd64-1 \
v1.17/debian-s3:v1.17.1-debian-s3-amd64-1.2,v1.17-debian-s3-amd64-1 \
v1.17/debian-syslog:v1.17.1-debian-syslog-amd64-1.2,v1.17-debian-syslog-amd64-1 \
v1.17/debian-forward:v1.17.1-debian-forward-amd64-1.2,v1.17-debian-forward-amd64-1 \
v1.17/debian-gcs:v1.17.1-debian-gcs-amd64-1.2,v1.17-debian-gcs-amd64-1 \
v1.17/debian-graylog:v1.17.1-debian-graylog-amd64-1.2,v1.17-debian-graylog-amd64-1 \
v1.17/debian-papertrail:v1.17.1-debian-papertrail-amd64-1.2,v1.17-debian-papertrail-amd64-1 \
v1.17/debian-logzio:v1.17.1-debian-logzio-amd64-1.2,v1.17-debian-logzio-amd64-1 \
v1.17/debian-kafka:v1.17.1-debian-kafka-amd64-1.2,v1.17-debian-kafka-amd64-1 \
v1.17/debian-kafka2:v1.17.1-debian-kafka2-amd64-1.2,v1.17-debian-kafka2-amd64-1 \
v1.17/debian-kinesis:v1.17.1-debian-kinesis-amd64-1.2,v1.17-debian-kinesis-amd64-1

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

ARM64_IMAGES := \
v1.17/arm64/debian-azureblob:v1.17.1-debian-azureblob-arm64-1.1,v1.17-debian-azureblob-arm64-1 \
v1.17/arm64/debian-elasticsearch8:v1.17.1-debian-elasticsearch8-arm64-1.1,v1.17-debian-elasticsearch8-arm64-1 \
v1.17/arm64/debian-elasticsearch7:v1.17.1-debian-elasticsearch7-arm64-1.1,v1.17-debian-elasticsearch7-arm64-1,v1-debian-elasticsearch-arm64 \
v1.17/arm64/debian-opensearch:v1.17.1-debian-opensearch-arm64-1.1,v1.17-debian-opensearch-arm64-1 \
v1.17/arm64/debian-loggly:v1.17.1-debian-loggly-arm64-1.1,v1.17-debian-loggly-arm64-1 \
v1.17/arm64/debian-logentries:v1.17.1-debian-logentries-arm64-1.1,v1.17-debian-logentries-arm64-1 \
v1.17/arm64/debian-cloudwatch:v1.17.1-debian-cloudwatch-arm64-1.1,v1.17-debian-cloudwatch-arm64-1 \
v1.17/arm64/debian-s3:v1.17.1-debian-s3-arm64-1.1,v1.17-debian-s3-arm64-1 \
v1.17/arm64/debian-syslog:v1.17.1-debian-syslog-arm64-1.1,v1.17-debian-syslog-arm64-1 \
v1.17/arm64/debian-forward:v1.17.1-debian-forward-arm64-1.1,v1.17-debian-forward-arm64-1 \
v1.17/arm64/debian-gcs:v1.17.1-debian-gcs-arm64-1.1,v1.17-debian-gcs-arm64-1 \
v1.17/arm64/debian-graylog:v1.17.1-debian-graylog-arm64-1.1,v1.17-debian-graylog-arm64-1 \
v1.17/arm64/debian-papertrail:v1.17.1-debian-papertrail-arm64-1.1,v1.17-debian-papertrail-arm64-1 \
v1.17/arm64/debian-logzio:v1.17.1-debian-logzio-arm64-1.1,v1.17-debian-logzio-arm64-1 \
v1.17/arm64/debian-kafka:v1.17.1-debian-kafka-arm64-1.1,v1.17-debian-kafka-arm64-1 \
v1.17/arm64/debian-kafka2:v1.17.1-debian-kafka2-arm64-1.1,v1.17-debian-kafka2-arm64-1 \
v1.17/arm64/debian-kinesis:v1.17.1-debian-kinesis-arm64-1.1,v1.17-debian-kinesis-arm64-1
v1.17/arm64/debian-azureblob:v1.17.1-debian-azureblob-arm64-1.2,v1.17-debian-azureblob-arm64-1 \
v1.17/arm64/debian-elasticsearch8:v1.17.1-debian-elasticsearch8-arm64-1.2,v1.17-debian-elasticsearch8-arm64-1 \
v1.17/arm64/debian-elasticsearch7:v1.17.1-debian-elasticsearch7-arm64-1.2,v1.17-debian-elasticsearch7-arm64-1,v1-debian-elasticsearch-arm64 \
v1.17/arm64/debian-opensearch:v1.17.1-debian-opensearch-arm64-1.2,v1.17-debian-opensearch-arm64-1 \
v1.17/arm64/debian-loggly:v1.17.1-debian-loggly-arm64-1.2,v1.17-debian-loggly-arm64-1 \
v1.17/arm64/debian-logentries:v1.17.1-debian-logentries-arm64-1.2,v1.17-debian-logentries-arm64-1 \
v1.17/arm64/debian-cloudwatch:v1.17.1-debian-cloudwatch-arm64-1.2,v1.17-debian-cloudwatch-arm64-1 \
v1.17/arm64/debian-s3:v1.17.1-debian-s3-arm64-1.2,v1.17-debian-s3-arm64-1 \
v1.17/arm64/debian-syslog:v1.17.1-debian-syslog-arm64-1.2,v1.17-debian-syslog-arm64-1 \
v1.17/arm64/debian-forward:v1.17.1-debian-forward-arm64-1.2,v1.17-debian-forward-arm64-1 \
v1.17/arm64/debian-gcs:v1.17.1-debian-gcs-arm64-1.2,v1.17-debian-gcs-arm64-1 \
v1.17/arm64/debian-graylog:v1.17.1-debian-graylog-arm64-1.2,v1.17-debian-graylog-arm64-1 \
v1.17/arm64/debian-papertrail:v1.17.1-debian-papertrail-arm64-1.2,v1.17-debian-papertrail-arm64-1 \
v1.17/arm64/debian-logzio:v1.17.1-debian-logzio-arm64-1.2,v1.17-debian-logzio-arm64-1 \
v1.17/arm64/debian-kafka:v1.17.1-debian-kafka-arm64-1.2,v1.17-debian-kafka-arm64-1 \
v1.17/arm64/debian-kafka2:v1.17.1-debian-kafka2-arm64-1.2,v1.17-debian-kafka2-arm64-1 \
v1.17/arm64/debian-kinesis:v1.17.1-debian-kinesis-arm64-1.2,v1.17-debian-kinesis-arm64-1

ALL_IMAGES := $(X86_IMAGES) $(ARM64_IMAGES)

Expand Down
4 changes: 2 additions & 2 deletions templates/Dockerfile.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ 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:<%= fluentd_ver %>-debian-arm64-1.0
FROM fluent/fluentd:<%= fluentd_ver %>-debian-arm64-1.1
COPY --from=builder /go/qemu-aarch64-static /usr/bin/
<% else %>
FROM fluent/fluentd:<%= fluentd_ver %>-debian-amd64-1.0
FROM fluent/fluentd:<%= fluentd_ver %>-debian-amd64-1.1
<% end %>

LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
Expand Down

0 comments on commit e79ae02

Please sign in to comment.