diff --git a/Makefile b/Makefile index d32e34e..9c7f6f2 100644 --- a/Makefile +++ b/Makefile @@ -17,21 +17,21 @@ IMAGE_NAME := fluent/fluentd X86_IMAGES := \ - v1.16/alpine:v1.16.5-1.0,v1.16-2,edge \ - v1.16/debian:v1.16.5-debian-amd64-1.0,v1.16-debian-amd64-2,edge-debian-amd64 + v1.17/alpine:v1.17.0-1.0,v1.17-1,edge \ + v1.17/debian:v1.17.0-debian-amd64-1.0,v1.17-debian-amd64-1,edge-debian-amd64 # :,,,... # Define images for running on ARM platforms ARM_IMAGES := \ - v1.16/armhf/debian:v1.16.5-debian-armhf-1.0,v1.16-debian-armhf-2,edge-debian-armhf \ + v1.17/armhf/debian:v1.17.0-debian-armhf-1.0,v1.17-debian-armhf-1,edge-debian-armhf \ # Define images for running on ARM64 platforms ARM64_IMAGES := \ - v1.16/arm64/debian:v1.16.5-debian-arm64-1.0,v1.16-debian-arm64-2,edge-debian-arm64 \ + v1.17/arm64/debian:v1.17.0-debian-arm64-1.0,v1.16-debian-arm64-1,edge-debian-arm64 \ WINDOWS_IMAGES := \ - v1.16/windows-ltsc2019:v1.16.5-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1 \ - v1.16/windows-ltsc2022:v1.16.5-windows-ltsc2022-1.0,v1.16-windows-ltsc2022-1 + v1.17/windows-ltsc2019:v1.17.0-windows-ltsc2019-1.0,v1.17-windows-ltsc2019-1 \ + v1.17/windows-ltsc2022:v1.17.0-windows-ltsc2022-1.0,v1.17-windows-ltsc2022-1 LINUX_IMAGES := $(X86_IMAGES) $(ARM_IMAGES) $(ARM64_IMAGES) ALL_IMAGES := $(LINUX_IMAGES) $(WINDOWS_IMAGES) diff --git a/README.md b/README.md index 2cf4891..de4b111 100644 --- a/README.md +++ b/README.md @@ -22,20 +22,20 @@ These tags have image version postfix. This updates many places so we need feedb Current images use fluentd v1 series. -- `v1.16.5-1.0`, `v1.16-2`, `edge` - [(v1.16/alpine/Dockerfile)][fluentd-1-alpine] -- `v1.16.5-debian-1.0`, `v1.16-debian-2`, `edge-debian` +- `v1.17.0-1.0`, `v1.17-1`, `edge` + [(v1.17/alpine/Dockerfile)][fluentd-1-alpine] +- `v1.17.0-debian-1.0`, `v1.17-debian-1`, `edge-debian` (multiarch image for arm64(AArch64) and amd64(x86_64)) -- `v1.16.5-debian-amd64-1.0`, `v1.16-debian-amd64-2`, `edge-debian-amd64` - [(v1.16/debian/Dockerfile)][fluentd-1-debian] -- `v1.16.5-debian-arm64-1.0`, `v1.16-debian-arm64-2`, `edge-debian-arm64` - [(v1.16/arm64/debian/Dockerfile)][fluentd-1-debian-arm64] -- `v1.16.5-debian-armhf-1.0`, `v1.16-debian-armhf-2`, `edge-debian-armhf` - [(v1.16/armhf/debian/Dockerfile)][fluentd-1-debian-armhf] -- `v1.16.5-windows-ltsc2019-1.0`, `v1.16-windows-ltsc2019-1` - [(v1.16/windows-ltsc2019/Dockerfile)][fluentd-1-ltsc2019-windows] -- `v1.16.5-windows-ltsc2022-1.0`, `v1.16-windows-ltsc2022-1` - [(v1.16/windows-ltsc2022/Dockerfile)][fluentd-1-ltsc2022-windows] +- `v1.17.0-debian-amd64-1.0`, `v1.17-debian-amd64-1`, `edge-debian-amd64` + [(v1.17/debian/Dockerfile)][fluentd-1-debian] +- `v1.17.0-debian-arm64-1.0`, `v1.17-debian-arm64-1`, `edge-debian-arm64` + [(v1.17/arm64/debian/Dockerfile)][fluentd-1-debian-arm64] +- `v1.17.0-debian-armhf-1.0`, `v1.17-debian-armhf-1`, `edge-debian-armhf` + [(v1.17/armhf/debian/Dockerfile)][fluentd-1-debian-armhf] +- `v1.17.0-windows-ltsc2019-1.0`, `v1.17-windows-ltsc2019-1` + [(v1.17/windows-ltsc2019/Dockerfile)][fluentd-1-ltsc2019-windows] +- `v1.17.0-windows-ltsc2022-1.0`, `v1.17-windows-ltsc2022-1` + [(v1.17/windows-ltsc2022/Dockerfile)][fluentd-1-ltsc2022-windows] ### Old v1.4 images @@ -223,7 +223,7 @@ To add plugins, edit `Dockerfile` as following: #### Alpine version ```Dockerfile -FROM fluent/fluentd:v1.16-1 +FROM fluent/fluentd:v1.17-1 # Use root account to use apk USER root @@ -246,7 +246,7 @@ USER fluent #### Debian version ```Dockerfile -FROM fluent/fluentd:v1.16-debian-1 +FROM fluent/fluentd:v1.17-debian-1 # Use root account to use apt USER root @@ -389,9 +389,9 @@ through a [GitHub issue](https://github.com/fluent/fluentd-docker-image/issues). [fluentd-1-4-debian]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.4/debian/Dockerfile [fluentd-1-4-debian-onbuild]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.4/debian-onbuild/Dockerfile [fluentd-1-4-windows]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.4/windows/Dockerfile -[fluentd-1-alpine]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.16/alpine/Dockerfile -[fluentd-1-debian]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.16/debian/Dockerfile -[fluentd-1-debian-arm64]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.16/arm64/debian/Dockerfile -[fluentd-1-debian-armhf]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.16/armhf/debian/Dockerfile -[fluentd-1-ltsc2019-windows]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.16/windows-ltsc2019/Dockerfile -[fluentd-1-ltsc2022-windows]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.16/windows-ltsc2019/Dockerfile +[fluentd-1-alpine]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.17/alpine/Dockerfile +[fluentd-1-debian]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.17/debian/Dockerfile +[fluentd-1-debian-arm64]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.17/arm64/debian/Dockerfile +[fluentd-1-debian-armhf]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.17/armhf/debian/Dockerfile +[fluentd-1-ltsc2019-windows]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.17/windows-ltsc2019/Dockerfile +[fluentd-1-ltsc2022-windows]: https://github.com/fluent/fluentd-docker-image/blob/master/v1.17/windows-ltsc2019/Dockerfile