From 97e7eb1c1311df73484cd3d1c29e2cde6b327fe5 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Fri, 7 Jun 2024 17:42:57 +0200 Subject: [PATCH] deployment/docker/Makefile: upgrade Go builder from 1.22.3 to 1.22.4 See https://github.com/golang/go/issues?q=milestone%3AGo1.22.4+label%3ACherryPickApproved --- app/vmui/Dockerfile-web | 2 +- deployment/docker/Makefile | 2 +- docs/CHANGELOG.md | 2 +- go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/vmui/Dockerfile-web b/app/vmui/Dockerfile-web index 19276f4c7a..ddea3c5e51 100644 --- a/app/vmui/Dockerfile-web +++ b/app/vmui/Dockerfile-web @@ -1,4 +1,4 @@ -FROM golang:1.22.3 as build-web-stage +FROM golang:1.22.4 as build-web-stage COPY build /build WORKDIR /build diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index 76d373d3ff..5168dd6dbc 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -5,7 +5,7 @@ DOCKER_NAMESPACE ?= victoriametrics ROOT_IMAGE ?= alpine:3.20.0 CERTS_IMAGE := alpine:3.20.0 -GO_BUILDER_IMAGE := golang:1.22.3-alpine +GO_BUILDER_IMAGE := golang:1.22.4-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 c4c35895d1..e04e2ed764 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -11,7 +11,7 @@ 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.22.2 to Go1.22.3. See [the list of issues addressed in Go1.22.3](https://github.com/golang/go/issues?q=milestone%3AGo1.22.3+label%3ACherryPickApproved). +* SECURITY: upgrade Go builder from Go1.22.2 to Go1.22.4. See the list of issues addressed in [Go1.22.3](https://github.com/golang/go/issues?q=milestone%3AGo1.22.3+label%3ACherryPickApproved) and [Go1.22.4](https://github.com/golang/go/issues?q=milestone%3AGo1.22.4+label%3ACherryPickApproved). * SECURITY: upgrade base docker image (Alpine) from 3.19.1 to 3.20.0. See [alpine 3.20.0 release notes](https://www.alpinelinux.org/posts/Alpine-3.20.0-released.html). * BUGFIX: [vmui](https://docs.victoriametrics.com/#vmui): fix calendar display when `UTC+00:00` timezone is set. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/6239). diff --git a/go.mod b/go.mod index 512f37f7d2..83699b333d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/VictoriaMetrics/VictoriaMetrics -go 1.22.3 +go 1.22.4 require ( cloud.google.com/go/storage v1.40.0