From 931a60eff87b2f08cbf92afa8765c02ee2ea6e3e Mon Sep 17 00:00:00 2001 From: Marco Nelles Date: Tue, 7 Nov 2023 08:26:03 +0100 Subject: [PATCH 1/2] change golang version to 1.21.3 --- .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 ++-- 14 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index bb8d1972..bc72256b 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.1 + go-version: 1.21.3 - name: Install package dependencies run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index a0090a8e..d3941c35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.2.19 (2023-11-07) + +* Upgrade Go to 1.21.3 + ## 2.2.9 (2023/10/04) * Upgrade Go to 1.21.1 diff --git a/cmd/fluent-bit/Dockerfile b/cmd/fluent-bit/Dockerfile index 233d5ecc..22e0b3e3 100644 --- a/cmd/fluent-bit/Dockerfile +++ b/cmd/fluent-bit/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.1 as build +FROM golang:1.21.3 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 8f920107..924f5a4d 100644 --- a/cmd/logcli/Dockerfile +++ b/cmd/logcli/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.1 as build +FROM golang:1.21.3 as build ARG TOUCH_PROTOS COPY . /src/vali diff --git a/cmd/migrate/Dockerfile b/cmd/migrate/Dockerfile index d1b0b127..8eb636af 100644 --- a/cmd/migrate/Dockerfile +++ b/cmd/migrate/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.1 as build +FROM golang:1.21.3 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 ae44fd11..71301814 100644 --- a/cmd/querytee/Dockerfile +++ b/cmd/querytee/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.1 as build +FROM golang:1.21.3 as build ARG TOUCH_PROTOS COPY . /src/vali diff --git a/cmd/querytee/Dockerfile.cross b/cmd/querytee/Dockerfile.cross index 4361f8db..3367a19a 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.1-alpine as goenv +FROM golang:1.21.3-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 cb0b3ea7..1b3eb532 100644 --- a/cmd/vali-canary/Dockerfile +++ b/cmd/vali-canary/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.1 as build +FROM golang:1.21.3 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 ee8ab48b..845f3fd4 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.1-alpine as goenv +FROM golang:1.21.3-alpine as goenv RUN go env GOARCH > /goarch && \ go env GOARM > /goarm diff --git a/cmd/vali/Dockerfile b/cmd/vali/Dockerfile index 8bbecd17..1800c95e 100644 --- a/cmd/vali/Dockerfile +++ b/cmd/vali/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.1 as build +FROM golang:1.21.3 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 2fbe0e0c..5eb0aa56 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.1-alpine as goenv +FROM golang:1.21.3-alpine as goenv RUN go env GOARCH > /goarch && \ go env GOARM > /goarm diff --git a/cmd/valitail/Dockerfile b/cmd/valitail/Dockerfile index 7916ba76..9d7bb352 100644 --- a/cmd/valitail/Dockerfile +++ b/cmd/valitail/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.1-bullseye as build +FROM golang:1.21.3-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 d82a9404..175ca53e 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.1-alpine as goenv +FROM golang:1.21.3-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 2ca9c48b..6bb754ca 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.1 as faillint +FROM docker.io/library/golang:1.21.3 as faillint RUN go install github.com/fatih/faillint@v1.11.0 -FROM docker.io/library/golang:1.21.1-bullseye +FROM docker.io/library/golang:1.21.3-bullseye RUN apt-get update && \ apt-get install -qy \ musl gnupg \ From a5fcc27500c3dba8cca63362724c1985eedc8169 Mon Sep 17 00:00:00 2001 From: Marco Nelles Date: Tue, 7 Nov 2023 10:18:10 +0100 Subject: [PATCH 2/2] fix version typo in CHANGELOG# --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3941c35..86a51cb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.2.19 (2023-11-07) +## 2.2.10 (2023-11-07) * Upgrade Go to 1.21.3