From b3f057f75a3d7be198d1b1d96184612e0c52796b Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Wed, 7 Feb 2024 04:00:35 +0200 Subject: [PATCH] all: update Go builder from Go1.21.6 to Go1.21.7 See https://github.com/golang/go/issues?q=milestone%3AGo1.21.7+label%3ACherryPickApproved --- app/vmui/Dockerfile-web | 2 +- deployment/docker/Makefile | 2 +- docs/CHANGELOG.md | 2 ++ snap/local/Makefile | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/vmui/Dockerfile-web b/app/vmui/Dockerfile-web index d7a14c7a3f..522bd7d813 100644 --- a/app/vmui/Dockerfile-web +++ b/app/vmui/Dockerfile-web @@ -1,4 +1,4 @@ -FROM golang:1.21.6 as build-web-stage +FROM golang:1.21.7 as build-web-stage COPY build /build WORKDIR /build diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index 420cb1ee3f..871f96db3b 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -5,7 +5,7 @@ DOCKER_NAMESPACE ?= victoriametrics ROOT_IMAGE ?= alpine:3.19.1 CERTS_IMAGE := alpine:3.19.1 -GO_BUILDER_IMAGE := golang:1.21.6-alpine +GO_BUILDER_IMAGE := golang:1.21.7-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_BUILD ?= docker build diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 762d6d9b86..ef7126bc82 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -11,6 +11,8 @@ The following `tip` changes can be tested by building VictoriaMetrics components ## v1.93.x long-time support release (LTS) +* SECURITY: upgrade Go builder from Go1.21.6 to Go1.21.7. See [the list of issues addressed in Go1.21.7](https://github.com/golang/go/issues?q=milestone%3AGo1.21.7+label%3ACherryPickApproved). + * BUGFIX: [MetricsQL](https://docs.victoriametrics.com/MetricsQL.html): properly propagate [label filters](https://docs.victoriametrics.com/keyconcepts/#filtering) from multiple arguments passed to [aggregate functions](https://docs.victoriametrics.com/metricsql/#aggregate-functions). For example, `sum({job="foo"}, {job="bar"}) by (job) + a` was improperly optimized to `sum({job="foo"}, {job="bar"}) by (job) + a{job="foo"}` before being executed. This could lead to unexpected results. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5604). ## [v1.93.11](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.93.11) diff --git a/snap/local/Makefile b/snap/local/Makefile index 8806f90fc3..184740be17 100644 --- a/snap/local/Makefile +++ b/snap/local/Makefile @@ -1,4 +1,4 @@ -GO_VERSION ?= 1.21.6 +GO_VERSION ?= 1.21.7 SNAP_BUILDER_IMAGE := local/snap-builder:2.0.0-$(shell echo $(GO_VERSION) | tr :/ __)