From e2c5940d8c8eec88fc3b3db0dc20d5bd9903aebe Mon Sep 17 00:00:00 2001 From: Jan Bolle Date: Thu, 4 Jul 2024 08:59:57 +0200 Subject: [PATCH] upgrade golang to 1.22.5 --- CHANGELOG.md | 1 + cmd/fluent-bit/Dockerfile | 2 +- cmd/logcli/Dockerfile | 2 +- cmd/migrate/Dockerfile | 2 +- cmd/querytee/Dockerfile | 2 +- cmd/querytee/Dockerfile.cross | 2 +- cmd/vali-canary/Dockerfile | 2 +- cmd/vali-canary/Dockerfile.cross | 2 +- cmd/vali/Dockerfile | 2 +- cmd/vali/Dockerfile.cross | 2 +- cmd/valitail/Dockerfile | 2 +- cmd/valitail/Dockerfile.cross | 2 +- vali-build-image/Dockerfile | 4 ++-- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ce818ce..831aa08e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## 2.2.17 (2024-07-04) +* Upgrade Go to 1.22.5 * Upgrade Alpine to 3.20.1 ## 2.2.16 (2024-06-13) diff --git a/cmd/fluent-bit/Dockerfile b/cmd/fluent-bit/Dockerfile index 9367fc14..c7f676ff 100644 --- a/cmd/fluent-bit/Dockerfile +++ b/cmd/fluent-bit/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.4 as build +FROM golang:1.22.5 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 d3a5c5f0..cfd576e4 100644 --- a/cmd/logcli/Dockerfile +++ b/cmd/logcli/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.4 as build +FROM golang:1.22.5 as build ARG TOUCH_PROTOS COPY . /src/vali diff --git a/cmd/migrate/Dockerfile b/cmd/migrate/Dockerfile index 1e69ce56..3f32cf0e 100644 --- a/cmd/migrate/Dockerfile +++ b/cmd/migrate/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.4 as build +FROM golang:1.22.5 as build COPY . /src/vali WORKDIR /src/vali RUN make clean && make BUILD_IN_CONTAINER=false migrate diff --git a/cmd/querytee/Dockerfile b/cmd/querytee/Dockerfile index 8f4f4016..a956c470 100644 --- a/cmd/querytee/Dockerfile +++ b/cmd/querytee/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.4 as build +FROM golang:1.22.5 as build ARG TOUCH_PROTOS COPY . /src/vali diff --git a/cmd/querytee/Dockerfile.cross b/cmd/querytee/Dockerfile.cross index 90531ba6..c0f966e4 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.22.3-alpine as goenv +FROM golang:1.22.5-alpine as goenv RUN go env GOARCH > /goarch && \ go env GOARM > /goarm diff --git a/cmd/vali-canary/Dockerfile b/cmd/vali-canary/Dockerfile index 507c5c1c..6c890e18 100644 --- a/cmd/vali-canary/Dockerfile +++ b/cmd/vali-canary/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.4 as build +FROM golang:1.22.5 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/vali-canary/Dockerfile.cross b/cmd/vali-canary/Dockerfile.cross index 44d90ca7..214c9263 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.22.3-alpine as goenv +FROM golang:1.22.5-alpine as goenv RUN go env GOARCH > /goarch && \ go env GOARM > /goarm diff --git a/cmd/vali/Dockerfile b/cmd/vali/Dockerfile index 4846fee7..1ed85fa1 100644 --- a/cmd/vali/Dockerfile +++ b/cmd/vali/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.4 as build +FROM golang:1.22.5 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/vali/Dockerfile.cross b/cmd/vali/Dockerfile.cross index cb2f3795..4c08db8c 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.22.3-alpine as goenv +FROM golang:1.22.5-alpine as goenv RUN go env GOARCH > /goarch && \ go env GOARM > /goarm diff --git a/cmd/valitail/Dockerfile b/cmd/valitail/Dockerfile index 0a415e26..b3700c59 100644 --- a/cmd/valitail/Dockerfile +++ b/cmd/valitail/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.4-bookworm as build +FROM golang:1.22.5-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.cross b/cmd/valitail/Dockerfile.cross index a5b45c64..5b92986b 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.22.3-alpine as goenv +FROM golang:1.22.5-alpine as goenv RUN go env GOARCH > /goarch && \ go env GOARM > /goarm diff --git a/vali-build-image/Dockerfile b/vali-build-image/Dockerfile index dfed6241..d019db4b 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.22.4 as faillint +FROM docker.io/library/golang:1.22.5 as faillint RUN go install github.com/fatih/faillint@v1.11.0 -FROM docker.io/library/golang:1.22.4-bookworm +FROM docker.io/library/golang:1.22.5-bookworm RUN apt-get update && \ apt-get install -qy \ musl gnupg \