update golang to 1.22.4, update alpine to 3.20.0, update bullseye ima…

…ges to bookworm images

---------

Co-authored-by: Marco Nelles <marco.nelles@netapp.com>

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.2.16 (2024-06-13)
+
+* Upgrade Go to 1.22.4
+* Upgrade Alpine to 3.20.0
+* Upgrade valitail base image to Debian bookworm
+
 ## 2.2.15 (2024-05-17)
 
 * Upgrade Go to 1.22.3

cmd/fluent-bit/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22.3 as build
+FROM golang:1.22.4 as build
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false fluent-bit-plugin

cmd/logcli/Dockerfile

@@ -1,11 +1,11 @@
-FROM golang:1.22.3 as build
+FROM golang:1.22.4 as build
 
 ARG TOUCH_PROTOS
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false logcli
 
-FROM alpine:3.19
+FROM alpine:3.20.0
 
 RUN apk add --no-cache ca-certificates
 

cmd/migrate/Dockerfile

@@ -1,9 +1,9 @@
-FROM golang:1.22.3 as build
+FROM golang:1.22.4 as build
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false migrate
 
-FROM alpine:3.19
+FROM alpine:3.20.0
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/migrate/migrate /usr/bin/migrate
 #ENTRYPOINT [ "/usr/bin/migrate" ]

cmd/querytee/Dockerfile

@@ -1,11 +1,11 @@
-FROM golang:1.22.3 as build
+FROM golang:1.22.4 as build
 
 ARG TOUCH_PROTOS
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false vali-querytee
 
-FROM alpine:3.19
+FROM alpine:3.20.0
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/querytee/vali-querytee /usr/bin/querytee
 ENTRYPOINT [ "/usr/bin/querytee" ]

cmd/vali-canary/Dockerfile

@@ -1,12 +1,12 @@
-FROM golang:1.22.3 as build
+FROM golang:1.22.4 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false vali-canary
 
-FROM alpine:3.19
+FROM alpine:3.20.0
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/vali-canary/vali-canary /usr/bin/vali-canary
 ENTRYPOINT [ "/usr/bin/vali-canary" ]

cmd/vali/Dockerfile

@@ -1,12 +1,12 @@
-FROM golang:1.22.3 as build
+FROM golang:1.22.4 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false vali
 
-FROM alpine:3.19
+FROM alpine:3.20.0
 
 RUN apk add --no-cache ca-certificates libcap
 

cmd/valitail/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22.3-bullseye as build
+FROM golang:1.22.4-bookworm as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -qy libsystemd-dev
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false valitail
 
 # Valitail requires debian as the base image to support systemd journal reading
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 # tzdata required for the timestamp stage to work
 RUN apt-get update && \
   apt-get install -qy \

vali-build-image/Dockerfile

@@ -20,10 +20,10 @@ RUN apk add --no-cache docker-cli
 # Error:
 #	github.com/fatih/faillint@v1.5.0 requires golang.org/x/tools@v0.0.0-20200207224406-61798d64f025
 #   (not golang.org/x/tools@v0.0.0-20190918214920-58d531046acd from golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69)
-FROM docker.io/library/golang:1.22.3 as faillint
+FROM docker.io/library/golang:1.22.4 as faillint
 RUN go install github.com/fatih/faillint@v1.11.0
 
-FROM docker.io/library/golang:1.22.3-bullseye
+FROM docker.io/library/golang:1.22.4-bookworm
 RUN apt-get update && \
     apt-get install -qy \
     musl gnupg \