From b4de06384106c792542ec7903c429862285ff7fe Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@victoriametrics.com>
Date: Sat, 12 Aug 2023 08:31:16 -0700
Subject: [PATCH] Upgrade Go builder from 1.20.4 to 1.21.0

---
 .github/workflows/check-licenses.yml | 2 +-
 app/vmui/Dockerfile-web              | 2 +-
 deployment/docker/Makefile           | 2 +-
 docs/CHANGELOG.md                    | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
index df1ec0106a..70d3e87f7a 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.21.0
         id: go
       - name: Code checkout
         uses: actions/checkout@master
diff --git a/app/vmui/Dockerfile-web b/app/vmui/Dockerfile-web
index 8bb1c52411..82b253c7c7 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.21.0 as build-web-stage
 COPY build /build
 
 WORKDIR /build
diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile
index 20c97d05a6..9f2c4b8cd1 100644
--- a/deployment/docker/Makefile
+++ b/deployment/docker/Makefile
@@ -5,7 +5,7 @@ DOCKER_NAMESPACE := victoriametrics
 ROOT_IMAGE ?= alpine:3.18.3
 CERTS_IMAGE := alpine:3.18.3
 
-GO_BUILDER_IMAGE := golang:1.20.4-alpine
+GO_BUILDER_IMAGE := golang:1.21.0-alpine
 BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr :/ __)-1
 BASE_IMAGE := local/base:1.1.3-$(shell echo $(ROOT_IMAGE) | tr :/ __)-$(shell echo $(CERTS_IMAGE) | tr :/ __)
 
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 17ee41f13e..1dbb8813d1 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -15,6 +15,7 @@ The following tip changes can be tested by building VictoriaMetrics components f
 
 ## v1.79.x long-time support release (LTS)
 
+* SECURITY: upgrade Go builder from Go1.20.4 to Go1.21.0.
 * SECURITY: upgrade base docker image (Alpine) from 3.18.2 to 3.18.3. See [alpine 3.18.3 release notes](https://alpinelinux.org/posts/Alpine-3.15.10-3.16.7-3.17.5-3.18.3-released.html).
 
 * BUGFIX: [vmalert](https://docs.victoriametrics.com/vmalert.html): Properly form path to static assets in WEB UI if `http.pathPrefix` set. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4349).