From 8cb7074030f18ec75199f57bf76791996f06b89c Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Sun, 14 Nov 2021 12:21:32 +0200 Subject: [PATCH] deployment/docker: allow using `/` chars in `ROOT_IMAGE` when running `make package-*` This fixes the following command: ROOT_IMAGE=gcr.io/distroless/static make package-victoria-metrics --- deployment/docker/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index d54f83fcc..8f3a8eb62 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -5,8 +5,8 @@ DOCKER_NAMESPACE := victoriametrics ROOT_IMAGE ?= alpine:3.14.2 CERTS_IMAGE := alpine:3.14.2 GO_BUILDER_IMAGE := golang:1.17.3-alpine -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 : _) +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 :/ __) package-base: (docker image ls --format '{{.Repository}}:{{.Tag}}' | grep -q '$(BASE_IMAGE)$$') \