Skip to content

Commit

Permalink
Bump base arm64 image (#1562)
Browse files Browse the repository at this point in the history
Recently QEMU on amd64 host cause build failure, so
we switched to ubuntu 24.04 arm host.

This is because that -arm64-1.0 will not published.
Use -arm64-1.1 for k8s.

fluent/fluentd-docker-image#414
fluent/fluentd-docker-image#417

Signed-off-by: Kentaro Hayashi <[email protected]>
  • Loading branch information
kenhys authored Feb 3, 2025
1 parent 95361d0 commit 6b6388c
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-azureblob/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-forward/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-gcs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-graylog/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-kafka/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-kafka2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-kinesis/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-logentries/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-loggly/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-logzio/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-opensearch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-papertrail/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-s3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion docker-image/v1.16/arm64/debian-syslog/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.16.7-debian-arm64-1.0
FROM fluent/fluentd:v1.16.7-debian-arm64-1.1

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
Expand Down
2 changes: 1 addition & 1 deletion templates/Dockerfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<% if is_arm64 %>
# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:<%= fluentd_ver %>-debian-arm64-1.0
FROM fluent/fluentd:<%= fluentd_ver %>-debian-arm64-1.1
<% else %>
FROM fluent/fluentd:<%= fluentd_ver %>-debian-amd64-1.0
<% end %>
Expand Down

0 comments on commit 6b6388c

Please sign in to comment.