From 4fa4da1e988d7add6561f566e871d260889e2123 Mon Sep 17 00:00:00 2001 From: Marco Nelles Date: Tue, 6 Feb 2024 08:38:56 +0100 Subject: [PATCH] Upgrade Go version to 1.21.6 --- .github/workflows/release.yml | 2 +- .github/workflows/unit-test.yml | 2 +- CHANGELOG.md | 4 ++++ 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 ++-- 15 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 74bd10f0..a475c4f2 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.21.5 + go-version: 1.21.6 - name: Install package dependencies run: | diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 0bd72c49..fc0fafe9 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.21.5 + go-version: 1.21.6 - name: Install package dependencies run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a5ddb8a..ce6256d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.2.14 (2024-02-06) + +* Upgrade Go to 1.21.6 + ## 2.2.13 (2024-01-04) * Bump alpine image to 3.19 diff --git a/cmd/fluent-bit/Dockerfile b/cmd/fluent-bit/Dockerfile index cc960a57..6c16a29e 100644 --- a/cmd/fluent-bit/Dockerfile +++ b/cmd/fluent-bit/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.5 as build +FROM golang:1.21.6 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 6f8ec119..81a1c697 100644 --- a/cmd/logcli/Dockerfile +++ b/cmd/logcli/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.5 as build +FROM golang:1.21.6 as build ARG TOUCH_PROTOS COPY . /src/vali diff --git a/cmd/migrate/Dockerfile b/cmd/migrate/Dockerfile index 011bf619..b0e25787 100644 --- a/cmd/migrate/Dockerfile +++ b/cmd/migrate/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.5 as build +FROM golang:1.21.6 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 3dcf6d15..f003500d 100644 --- a/cmd/querytee/Dockerfile +++ b/cmd/querytee/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.5 as build +FROM golang:1.21.6 as build ARG TOUCH_PROTOS COPY . /src/vali diff --git a/cmd/querytee/Dockerfile.cross b/cmd/querytee/Dockerfile.cross index 661bb6c8..92c52a30 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.21.5-alpine as goenv +FROM golang:1.21.6-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 dcd0caa5..dd17cc0f 100644 --- a/cmd/vali-canary/Dockerfile +++ b/cmd/vali-canary/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.5 as build +FROM golang:1.21.6 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 370dad88..61d75fec 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.21.5-alpine as goenv +FROM golang:1.21.6-alpine as goenv RUN go env GOARCH > /goarch && \ go env GOARM > /goarm diff --git a/cmd/vali/Dockerfile b/cmd/vali/Dockerfile index fc994267..6967d593 100644 --- a/cmd/vali/Dockerfile +++ b/cmd/vali/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.5 as build +FROM golang:1.21.6 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 d37d1a8b..dbf8dbd8 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.21.5-alpine as goenv +FROM golang:1.21.6-alpine as goenv RUN go env GOARCH > /goarch && \ go env GOARM > /goarm diff --git a/cmd/valitail/Dockerfile b/cmd/valitail/Dockerfile index 68d29cb8..49ee702e 100644 --- a/cmd/valitail/Dockerfile +++ b/cmd/valitail/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.5-bullseye as build +FROM golang:1.21.6-bullseye 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 74175ad4..6aa75e50 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.21.5-alpine as goenv +FROM golang:1.21.6-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 a9519663..87a370f3 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.21.5 as faillint +FROM docker.io/library/golang:1.21.6 as faillint RUN go install github.com/fatih/faillint@v1.11.0 -FROM docker.io/library/golang:1.21.5-bullseye +FROM docker.io/library/golang:1.21.6-bullseye RUN apt-get update && \ apt-get install -qy \ musl gnupg \