From a9e23cdf801703254bc692ac532c5114c8e64ce4 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Tue, 14 Feb 2023 23:05:14 -0800 Subject: [PATCH] all: update Go builder from Go1.20.0 to Go1.20.1 See https://github.com/golang/go/issues?q=milestone%3AGo1.20.1+label%3ACherryPickApproved --- .github/workflows/check-licenses.yml | 2 +- .github/workflows/main.yml | 2 +- app/vmui/Dockerfile-build | 2 +- app/vmui/Dockerfile-web | 2 +- deployment/docker/Makefile | 2 +- docs/CHANGELOG.md | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml index 7078127d4..70d3e87f7 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.19.5 + go-version: 1.21.0 id: go - name: Code checkout uses: actions/checkout@master diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 024734ac7..92117431e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@main with: - go-version: 1.19.5 + go-version: 1.20.1 id: go - name: Code checkout uses: actions/checkout@master diff --git a/app/vmui/Dockerfile-build b/app/vmui/Dockerfile-build index d6200aa94..9d1d1e430 100644 --- a/app/vmui/Dockerfile-build +++ b/app/vmui/Dockerfile-build @@ -1,4 +1,4 @@ -FROM node:18-alpine3.15 +FROM node:18-alpine3.17 RUN apk update && apk upgrade RUN apk add --no-cache bash bash-doc bash-completion libtool autoconf automake nasm pkgconfig libpng gcc make g++ zlib-dev gawk diff --git a/app/vmui/Dockerfile-web b/app/vmui/Dockerfile-web index 7a85f9780..90bd20294 100644 --- a/app/vmui/Dockerfile-web +++ b/app/vmui/Dockerfile-web @@ -1,4 +1,4 @@ -FROM golang:1.19.5 as build-web-stage +FROM golang:1.20.1 as build-web-stage COPY build /build WORKDIR /build diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index d530d1aa5..4f0959b00 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -4,7 +4,7 @@ DOCKER_NAMESPACE := victoriametrics ROOT_IMAGE ?= alpine:3.17.2 CERTS_IMAGE := alpine:3.17.2 -GO_BUILDER_IMAGE := golang:1.20.0-alpine +GO_BUILDER_IMAGE := golang:1.20.1-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 13d895a93..fb8085363 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -16,6 +16,7 @@ The following tip changes can be tested by building VictoriaMetrics components f ## v1.79.x long-time support release (LTS) * SECURITY: upgrade base docker image (alpine) from 3.17.1 to 3.17.2. See [alpine 3.17.2 release notes](https://alpinelinux.org/posts/Alpine-3.17.2-released.html). +* SECURITY: upgrade Go builder from Go1.20.0 to Go1.20.1. See [the list of issues addressed in Go1.20.1](https://github.com/golang/go/issues?q=milestone%3AGo1.20.1+label%3ACherryPickApproved). * BUGFIX: properly parse timestamps in milliseconds when [ingesting data via OpenTSDB telnet put protocol](https://docs.victoriametrics.com/#sending-data-via-telnet-put-protocol). Previously timestamps in milliseconds were mistakenly multiplied by 1000. Thanks to @Droxenator for the [pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/3810).