From 9e41f2cbb556a4d7dc7cd574f8751d12dfa7087c Mon Sep 17 00:00:00 2001 From: labkey-willm Date: Fri, 17 Nov 2023 15:37:28 -0800 Subject: [PATCH 1/2] add -debug to image tags if DEBUG=1 --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 307c5bc..4eb1b3b 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,11 @@ BUILD_REMOTE_REPO := $(BUILD_REPO_URI)/$(BUILD_REPO_NAME) BUILD_LOCAL_TAG ?= $(BUILD_REPO_NAME):$(BUILD_VERSION) BUILD_REMOTE_TAG := $(BUILD_REMOTE_REPO):$(BUILD_VERSION) +ifeq (1,$(DEBUG)) + BUILD_LOCAL_TAG := $(addsuffix -debug,$(BUILD_LOCAL_TAG)) + BUILD_REMOTE_TAG := $(addsuffix -debug,$(BUILD_REMOTE_TAG)) +endif + define tc $(shell printf "%steamcity[progressMessage '%s%n']" '##' '$1' ; ) endef From 267d808c59fa0e5e3c4303b5d495a17f6dc73300 Mon Sep 17 00:00:00 2001 From: labkey-willm Date: Fri, 17 Nov 2023 15:48:32 -0800 Subject: [PATCH 2/2] tab fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4eb1b3b..e6e5bbd 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ BUILD_REMOTE_TAG := $(BUILD_REMOTE_REPO):$(BUILD_VERSION) ifeq (1,$(DEBUG)) BUILD_LOCAL_TAG := $(addsuffix -debug,$(BUILD_LOCAL_TAG)) - BUILD_REMOTE_TAG := $(addsuffix -debug,$(BUILD_REMOTE_TAG)) + BUILD_REMOTE_TAG := $(addsuffix -debug,$(BUILD_REMOTE_TAG)) endif define tc