From d050103d2446893e40662b11c69c1b3f1828ebe1 Mon Sep 17 00:00:00 2001 From: Jan Bolle Date: Fri, 6 Dec 2024 09:20:10 +0100 Subject: [PATCH] Upgrade to Alpine 3.21.0 and Go 1.23.4 --- .github/workflows/release.yml | 2 +- .github/workflows/unit-test.yml | 2 +- CHANGELOG.md | 5 +++++ cmd/docker-driver/Dockerfile | 2 +- cmd/fluent-bit/Dockerfile | 2 +- cmd/logcli/Dockerfile | 4 ++-- cmd/migrate/Dockerfile | 4 ++-- cmd/querytee/Dockerfile | 4 ++-- cmd/querytee/Dockerfile.cross | 4 ++-- cmd/vali-canary/Dockerfile | 4 ++-- cmd/vali-canary/Dockerfile.cross | 4 ++-- cmd/vali/Dockerfile | 4 ++-- cmd/vali/Dockerfile.cross | 4 ++-- cmd/vali/Dockerfile.debug | 2 +- cmd/valitail/Dockerfile | 2 +- cmd/valitail/Dockerfile.arm32 | 2 +- cmd/valitail/Dockerfile.cross | 2 +- cmd/valitail/Dockerfile.debug | 2 +- vali-build-image/Dockerfile | 4 ++-- 19 files changed, 32 insertions(+), 27 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bddd9968..a96c1cbd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.23.2 + go-version: 1.23.4 - name: Install package dependencies run: | diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index c07d9c6c..17dade95 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.23.2 + go-version: 1.23.4 - name: Install package dependencies run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index a0802a7b..006e1218 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.2.20 (2024-12-06) + +* Upgrade Go to 1.23.4 +* Upgrade Alpine to 3.21.0 + ## 2.2.19 (2024-10-18) * Upgrade Go to 1.23.2 diff --git a/cmd/docker-driver/Dockerfile b/cmd/docker-driver/Dockerfile index bc2a4022..26908a4f 100644 --- a/cmd/docker-driver/Dockerfile +++ b/cmd/docker-driver/Dockerfile @@ -9,7 +9,7 @@ COPY . /src/vali WORKDIR /src/vali RUN make clean && make BUILD_IN_CONTAINER=false cmd/docker-driver/docker-driver -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk add --update --no-cache ca-certificates tzdata COPY --from=build /src/vali/cmd/docker-driver/docker-driver /bin/docker-driver WORKDIR /bin/ diff --git a/cmd/fluent-bit/Dockerfile b/cmd/fluent-bit/Dockerfile index 76679f69..45e45618 100644 --- a/cmd/fluent-bit/Dockerfile +++ b/cmd/fluent-bit/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.2 as build +FROM golang:1.23.4 as build COPY . /src/vali WORKDIR /src/vali RUN make clean && make BUILD_IN_CONTAINER=false fluent-bit-plugin diff --git a/cmd/logcli/Dockerfile b/cmd/logcli/Dockerfile index 7253fc06..6c421369 100644 --- a/cmd/logcli/Dockerfile +++ b/cmd/logcli/Dockerfile @@ -1,11 +1,11 @@ -FROM golang:1.23.2 as build +FROM golang:1.23.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.20.3 +FROM alpine:3.21.0 RUN apk add --no-cache ca-certificates diff --git a/cmd/migrate/Dockerfile b/cmd/migrate/Dockerfile index edbfc3ec..b0b89f51 100644 --- a/cmd/migrate/Dockerfile +++ b/cmd/migrate/Dockerfile @@ -1,9 +1,9 @@ -FROM golang:1.23.2 as build +FROM golang:1.23.4 as build COPY . /src/vali WORKDIR /src/vali RUN make clean && make BUILD_IN_CONTAINER=false migrate -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk add --update --no-cache ca-certificates COPY --from=build /src/vali/cmd/migrate/migrate /usr/bin/migrate #ENTRYPOINT [ "/usr/bin/migrate" ] diff --git a/cmd/querytee/Dockerfile b/cmd/querytee/Dockerfile index 5b126654..47436331 100644 --- a/cmd/querytee/Dockerfile +++ b/cmd/querytee/Dockerfile @@ -1,11 +1,11 @@ -FROM golang:1.23.2 as build +FROM golang:1.23.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.20.3 +FROM alpine:3.21.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" ] diff --git a/cmd/querytee/Dockerfile.cross b/cmd/querytee/Dockerfile.cross index af1d1fad..018560fe 100644 --- a/cmd/querytee/Dockerfile.cross +++ b/cmd/querytee/Dockerfile.cross @@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.9.1 # Directories in this file are referenced from the root of the project not this folder # This file is intended to be called from the root like so: # docker build -t ghcr.io/credativ/valitail -f cmd/valitail/Dockerfile . -FROM golang:1.23.2-alpine as goenv +FROM golang:1.23.4-alpine as goenv RUN go env GOARCH > /goarch && \ go env GOARM > /goarm @@ -12,7 +12,7 @@ COPY . /src/vali WORKDIR /src/vali RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false vali-querytee -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk add --update --no-cache ca-certificates COPY --from=build /src/vali/cmd/querytee/querytee /usr/bin/querytee ENTRYPOINT [ "/usr/bin/querytee" ] diff --git a/cmd/vali-canary/Dockerfile b/cmd/vali-canary/Dockerfile index c6a6c1f0..0d04bbf0 100644 --- a/cmd/vali-canary/Dockerfile +++ b/cmd/vali-canary/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.2 as build +FROM golang:1.23.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 @@ -6,7 +6,7 @@ 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.20.3 +FROM alpine:3.21.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" ] diff --git a/cmd/vali-canary/Dockerfile.cross b/cmd/vali-canary/Dockerfile.cross index 8d5bb8c2..992af187 100644 --- a/cmd/vali-canary/Dockerfile.cross +++ b/cmd/vali-canary/Dockerfile.cross @@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.12.0 # Directories in this file are referenced from the root of the project not this folder # This file is intended to be called from the root like so: # docker build -t ghcr.io/credativ/valitail -f cmd/valitail/Dockerfile . -FROM golang:1.23.2-alpine as goenv +FROM golang:1.23.4-alpine as goenv RUN go env GOARCH > /goarch && \ go env GOARM > /goarm @@ -12,7 +12,7 @@ COPY . /src/vali WORKDIR /src/vali RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false vali-canary -FROM alpine:3.20.3 +FROM alpine:3.21.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" ] diff --git a/cmd/vali/Dockerfile b/cmd/vali/Dockerfile index 48afbc9b..e6609880 100644 --- a/cmd/vali/Dockerfile +++ b/cmd/vali/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.2 as build +FROM golang:1.23.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 @@ -6,7 +6,7 @@ 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.20.3 +FROM alpine:3.21.0 RUN apk add --no-cache ca-certificates libcap diff --git a/cmd/vali/Dockerfile.cross b/cmd/vali/Dockerfile.cross index e07c1793..1aa39c31 100644 --- a/cmd/vali/Dockerfile.cross +++ b/cmd/vali/Dockerfile.cross @@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.12.0 # Directories in this file are referenced from the root of the project not this folder # This file is intended to be called from the root like so: # docker build -t ghcr.io/credativ/vali -f cmd/vali/Dockerfile . -FROM golang:1.23.2-alpine as goenv +FROM golang:1.23.4-alpine as goenv RUN go env GOARCH > /goarch && \ go env GOARM > /goarm @@ -12,7 +12,7 @@ COPY . /src/vali WORKDIR /src/vali RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false vali -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk add --no-cache ca-certificates diff --git a/cmd/vali/Dockerfile.debug b/cmd/vali/Dockerfile.debug index fd6a2f2a..fb161f6b 100644 --- a/cmd/vali/Dockerfile.debug +++ b/cmd/vali/Dockerfile.debug @@ -8,7 +8,7 @@ COPY . /src/vali WORKDIR /src/vali RUN make clean && make BUILD_IN_CONTAINER=false vali-debug -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk add --update --no-cache ca-certificates COPY --from=build /src/vali/cmd/vali/vali-debug /usr/bin/vali-debug COPY --from=build /go/bin/dlv /usr/bin/dlv diff --git a/cmd/valitail/Dockerfile b/cmd/valitail/Dockerfile index 0bbdb74b..1e9465fd 100644 --- a/cmd/valitail/Dockerfile +++ b/cmd/valitail/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.2-bookworm as build +FROM golang:1.23.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 diff --git a/cmd/valitail/Dockerfile.arm32 b/cmd/valitail/Dockerfile.arm32 index c7799f03..dad8eebf 100644 --- a/cmd/valitail/Dockerfile.arm32 +++ b/cmd/valitail/Dockerfile.arm32 @@ -1,4 +1,4 @@ -FROM golang:1.23.2 as build +FROM golang:1.23.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 diff --git a/cmd/valitail/Dockerfile.cross b/cmd/valitail/Dockerfile.cross index 4412c6cf..9b48ccee 100644 --- a/cmd/valitail/Dockerfile.cross +++ b/cmd/valitail/Dockerfile.cross @@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.12.0 # Directories in this file are referenced from the root of the project not this folder # This file is intended to be called from the root like so: # docker build -t ghcr.io/credativ/valitail -f cmd/valitail/Dockerfile . -FROM golang:1.23.2-alpine as goenv +FROM golang:1.23.4-alpine as goenv RUN go env GOARCH > /goarch && \ go env GOARM > /goarm diff --git a/cmd/valitail/Dockerfile.debug b/cmd/valitail/Dockerfile.debug index 1fb93d32..bccdc4a2 100644 --- a/cmd/valitail/Dockerfile.debug +++ b/cmd/valitail/Dockerfile.debug @@ -9,7 +9,7 @@ WORKDIR /src/vali RUN make clean && make BUILD_IN_CONTAINER=false valitail-debug -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk add --update --no-cache ca-certificates tzdata COPY --from=build /src/vali/cmd/valitail/valitail-debug /usr/bin/valitail-debug COPY --from=build /go/bin/dlv /usr/bin/dlv diff --git a/vali-build-image/Dockerfile b/vali-build-image/Dockerfile index a457c838..bca3c633 100644 --- a/vali-build-image/Dockerfile +++ b/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.23.2 as faillint +FROM docker.io/library/golang:1.23.4 as faillint RUN go install github.com/fatih/faillint@v1.14.0 -FROM docker.io/library/golang:1.23.2-bookworm +FROM docker.io/library/golang:1.23.4-bookworm RUN apt-get update && \ apt-get install -qy \ musl gnupg \