Skip to content

Commit ac7ea09

Browse files
authored
Merge branch 'master' into add-codeowners
2 parents e804073 + 771d21e commit ac7ea09

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile.common

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ifneq ($(shell command -v gotestsum 2> /dev/null),)
5555
endif
5656
endif
5757

58-
PROMU_VERSION ?= 0.18.0
58+
PROMU_VERSION ?= 0.18.1
5959
PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
6060

6161
SKIP_GOLANGCI_LINT :=
@@ -91,7 +91,7 @@ $(error DOCKERFILE_PATH is deprecated. Use DOCKERFILE_VARIANTS ?= $(DOCKERFILE_P
9191
endif
9292

9393
DOCKER_ARCHS ?= amd64
94-
DOCKERFILE_VARIANTS ?= Dockerfile $(wildcard Dockerfile.*)
94+
DOCKERFILE_VARIANTS ?= $(wildcard Dockerfile Dockerfile.*)
9595

9696
# Function to extract variant from Dockerfile label.
9797
# Returns the variant name from io.prometheus.image.variant label, or "default" if not found.

0 commit comments

Comments
 (0)