From 4624fda00d59dab29e89ae48551ad89a76330e0b Mon Sep 17 00:00:00 2001 From: Roman Khavronenko Date: Fri, 9 Jun 2023 09:42:55 +0200 Subject: [PATCH] all: update Go builder from Go1.20.4 to Go1.20.5 (#4427) See https://github.com/golang/go/issues?q=milestone%3AGo1.20.5+label%3ACherryPickApproved Signed-off-by: hagen1778 (cherry picked from commit 476c7bdd6f02b68fa8e0604a0234971eefc16610) Signed-off-by: hagen1778 --- .github/workflows/check-licenses.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/main.yml | 6 +++--- app/vmui/Dockerfile-web | 2 +- deployment/docker/Makefile | 2 +- docs/CHANGELOG.md | 1 + 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml index df1ec0106a..5fb182db9d 100644 --- a/.github/workflows/check-licenses.yml +++ b/.github/workflows/check-licenses.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Go uses: actions/setup-go@main with: - go-version: 1.20.4 + go-version: 1.20.5 id: go - name: Code checkout uses: actions/checkout@master diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5312e023da..7f315005b6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -57,7 +57,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.20.4 + go-version: 1.20.5 check-latest: true cache: true if: ${{ matrix.language == 'go' }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index efc643a003..6b6e9cd386 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: 1.20.4 + go-version: 1.20.5 check-latest: true cache: true @@ -56,7 +56,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: 1.20.4 + go-version: 1.20.5 check-latest: true cache: true @@ -81,7 +81,7 @@ jobs: id: go uses: actions/setup-go@v4 with: - go-version: 1.20.4 + go-version: 1.20.5 check-latest: true cache: true diff --git a/app/vmui/Dockerfile-web b/app/vmui/Dockerfile-web index 8bb1c52411..e446e29e02 100644 --- a/app/vmui/Dockerfile-web +++ b/app/vmui/Dockerfile-web @@ -1,4 +1,4 @@ -FROM golang:1.20.4 as build-web-stage +FROM golang:1.20.5 as build-web-stage COPY build /build WORKDIR /build diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index 93584ea469..830986ac29 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -9,7 +9,7 @@ ROOT_IMAGE ?= alpine:3.18.0 # TODO: sync it with ROOT_IMAGE when it will be fixed in the new alpine releases CERTS_IMAGE := alpine:3.17.3 -GO_BUILDER_IMAGE := golang:1.20.4-alpine +GO_BUILDER_IMAGE := golang:1.20.5-alpine BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr :/ __)-1 BASE_IMAGE := local/base:1.1.4-$(shell echo $(ROOT_IMAGE) | tr :/ __)-$(shell echo $(CERTS_IMAGE) | tr :/ __) DOCKER_COMPOSE ?= docker compose diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 81134c4adf..a276802e84 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -24,6 +24,7 @@ The following tip changes can be tested by building VictoriaMetrics components f ## tip +* SECURITY: upgrade Go builder from Go1.20.4 to Go1.20.5. See [the list of issues addressed in Go1.20.5](https://github.com/golang/go/issues?q=milestone%3AGo1.20.5+label%3ACherryPickApproved). * FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent.html): Adds `enable_http2` on scrape configuration level. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4283). Thanks to @Haleygo for [the pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/4295). * FEATURE: [vmctl](https://docs.victoriametrics.com/vmctl.html): add verbose output for docker installations or when TTY isn't available. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4081).