From 218974738e1ca15690724c63808ab5950a11550e Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Sat, 12 Aug 2023 05:59:45 -0700 Subject: [PATCH] deployment/docker/Makefile: upgrade base Docker image from alpine:3.18.2 to alpine:3.18.3 See https://alpinelinux.org/posts/Alpine-3.15.10-3.16.7-3.17.5-3.18.3-released.html --- deployment/docker/Makefile | 8 ++------ docs/CHANGELOG.md | 2 ++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index a4c7e2312d..20c97d05a6 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -2,12 +2,8 @@ DOCKER_NAMESPACE := victoriametrics -ROOT_IMAGE ?= alpine:3.18.0 - -# Use alpine:3.17.3 instead of 3.18.0 for CERTS_IMAGE -# because alpine:3.18.0 is broken for cross-platform builds -# TODO: sync it with ROOT_IMAGE when it will be fixed in the new alpine releases -CERTS_IMAGE := alpine:3.17.3 +ROOT_IMAGE ?= alpine:3.18.3 +CERTS_IMAGE := alpine:3.18.3 GO_BUILDER_IMAGE := golang:1.20.4-alpine BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr :/ __)-1 diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 7484b7361b..17ee41f13e 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -15,6 +15,8 @@ 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.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). * BUGFIX: [vmalert](https://docs.victoriametrics.com/vmalert.html): Properly set datasource query params. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4340). Thanks to @gsakun for [the pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/4341). * BUGFIX: [vmalert](https://docs.victoriametrics.com/vmalert.html): properly return empty slices instead of nil for `/api/v1/rules` and `/api/v1/alerts` API handlers. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4221).