Merge branch 'public-single-node' into pmm-6401-read-prometheus-data-files

This commit is contained in:
Aliaksandr Valialkin 2021-10-08 17:56:22 +03:00
commit 206e451cae
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1

View file

@ -4,7 +4,7 @@ DOCKER_NAMESPACE := victoriametrics
ROOT_IMAGE ?= alpine:3.14.2 ROOT_IMAGE ?= alpine:3.14.2
CERTS_IMAGE := alpine:3.14.2 CERTS_IMAGE := alpine:3.14.2
GO_BUILDER_IMAGE := golang:1.17.1-alpine GO_BUILDER_IMAGE := golang:1.17.2-alpine
BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr : _) BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr : _)
BASE_IMAGE := local/base:1.1.3-$(shell echo $(ROOT_IMAGE) | tr : _)-$(shell echo $(CERTS_IMAGE) | tr : _) BASE_IMAGE := local/base:1.1.3-$(shell echo $(ROOT_IMAGE) | tr : _)-$(shell echo $(CERTS_IMAGE) | tr : _)