From b7fcdb198504f5a055c2e127c949be662e71b33e Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@victoriametrics.com>
Date: Tue, 16 Jan 2024 17:00:16 +0200
Subject: [PATCH] deployment/docker: update Go builder from Go1.21.5 to
Go1.21.6
---
app/vmui/Dockerfile-web | 2 +-
deployment/docker/Makefile | 2 +-
deployment/logs-benchmark/docker-compose-elk.yml | 2 +-
deployment/logs-benchmark/docker-compose-loki.yml | 2 +-
docs/CHANGELOG.md | 3 +++
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/vmui/Dockerfile-web b/app/vmui/Dockerfile-web
index 11dcfb2707..d7a14c7a3f 100644
--- a/app/vmui/Dockerfile-web
+++ b/app/vmui/Dockerfile-web
@@ -1,4 +1,4 @@
-FROM golang:1.21.5 as build-web-stage
+FROM golang:1.21.6 as build-web-stage
COPY build /build
WORKDIR /build
diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile
index e0cc503df9..166407e04b 100644
--- a/deployment/docker/Makefile
+++ b/deployment/docker/Makefile
@@ -5,7 +5,7 @@ DOCKER_NAMESPACE ?= victoriametrics
ROOT_IMAGE ?= alpine:3.19.0
CERTS_IMAGE := alpine:3.19.0
-GO_BUILDER_IMAGE := golang:1.21.5-alpine
+GO_BUILDER_IMAGE := golang:1.21.6-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 ?= docker
diff --git a/deployment/logs-benchmark/docker-compose-elk.yml b/deployment/logs-benchmark/docker-compose-elk.yml
index 5b8b81106e..3cabb44839 100644
--- a/deployment/logs-benchmark/docker-compose-elk.yml
+++ b/deployment/logs-benchmark/docker-compose-elk.yml
@@ -18,7 +18,7 @@ services:
- vlogs
generator:
- image: golang:1.21.5-alpine
+ image: golang:1.21.6-alpine
restart: always
working_dir: /go/src/app
volumes:
diff --git a/deployment/logs-benchmark/docker-compose-loki.yml b/deployment/logs-benchmark/docker-compose-loki.yml
index db9a39d254..2b15312df5 100644
--- a/deployment/logs-benchmark/docker-compose-loki.yml
+++ b/deployment/logs-benchmark/docker-compose-loki.yml
@@ -2,7 +2,7 @@ version: '3'
services:
generator:
- image: golang:1.21.5-alpine
+ image: golang:1.21.6-alpine
restart: always
working_dir: /go/src/app
volumes:
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 8c03c6bb8d..54c99d4581 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -27,6 +27,9 @@ The sandbox cluster installation is running under the constant load generated by
[prometheus-benchmark](https://github.com/VictoriaMetrics/prometheus-benchmark) and used for testing latest releases.
## tip
+
+* SECURITY: upgrade Go builder from Go1.21.5 to Go1.21.6. See [the list of issues addressed in Go1.21.6](https://github.com/golang/go/issues?q=milestone%3AGo1.21.6+label%3ACherryPickApproved).
+
* FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent.html): add support for Service Discovery of the Hetzner Cloud and Hetzner Robot API targets. [this feature request](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3154).
* FEATURE: [vmselect](https://docs.victoriametrics.com/vmselect.html): adding support for negative index in Graphite groupByNode/aliasByNode. See [this pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/5581).
* FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent.html): add support for [DataDog v2 data ingestion protocol](https://docs.datadoghq.com/api/latest/metrics/#submit-metrics). See [these docs](https://docs.victoriametrics.com/#how-to-send-data-from-datadog-agent) and [this feature request](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4451).