Skip to content

Commit a1b9b3b

Browse files
authored
Update common Prometheus files (#3618)
Signed-off-by: prombot <prometheus-team@googlegroups.com>
1 parent 5a561a0 commit a1b9b3b

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.dockerignore

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
data/
12
.build/
23
.tarballs/
34

4-
!.build/linux-amd64
5-
!.build/linux-arm64
6-
!.build/linux-armv7
7-
!.build/linux-ppc64le
8-
!.build/linux-riscv64
9-
!.build/linux-s390x
5+
!.build/linux-amd64/
6+
!.build/linux-armv7/
7+
!.build/linux-arm64/
8+
!.build/linux-ppc64le/
9+
!.build/linux-s390x/
10+
!.build/linux-riscv64/

Makefile.common

Lines changed: 5 additions & 3 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 :=
@@ -90,8 +90,10 @@ ifdef DOCKERFILE_PATH
9090
$(error DOCKERFILE_PATH is deprecated. Use DOCKERFILE_VARIANTS ?= $(DOCKERFILE_PATH) in the Makefile)
9191
endif
9292

93-
DOCKER_ARCHS ?= amd64
94-
DOCKERFILE_VARIANTS ?= Dockerfile $(wildcard Dockerfile.*)
93+
DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le riscv64 s390x
94+
DOCKERFILE_ARCH_EXCLUSIONS ?=
95+
DOCKER_REGISTRY_ARCH_EXCLUSIONS ?= quay.io:riscv64
96+
DOCKERFILE_VARIANTS ?= $(wildcard Dockerfile Dockerfile.*)
9597

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

0 commit comments

Comments
 (0)