From 91ec7a35d3fa9787cedac93ffb80c5b5867586ef Mon Sep 17 00:00:00 2001
From: prombot <prometheus-team@googlegroups.com>
Date: Fri, 10 Apr 2026 18:03:18 +0000
Subject: [PATCH] Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>
---
 .dockerignore                       | 10 ++++++++++
 .github/workflows/golangci-lint.yml |  2 +-
 Makefile.common                     |  6 ++++--
 SECURITY.md                         |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..09670991
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,10 @@
+data/
+.build/
+.tarballs/
+
+!.build/linux-amd64/
+!.build/linux-arm64/
+!.build/linux-armv7/
+!.build/linux-ppc64le/
+!.build/linux-riscv64/
+!.build/linux-s390x/
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index dc8ffd02..d7477caf 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -30,7 +30,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install Go
-        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version: 1.26.x
       - name: Install snmp_exporter/generator dependencies
diff --git a/Makefile.common b/Makefile.common
index 52fe9daa..42dc653d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -61,7 +61,7 @@ PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_
 SKIP_GOLANGCI_LINT :=
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v2.10.1
+GOLANGCI_LINT_VERSION ?= v2.11.4
 GOLANGCI_FMT_OPTS ?=
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
 # windows isn't included here because of the path separator being different.
@@ -90,7 +90,9 @@ ifdef DOCKERFILE_PATH
 $(error DOCKERFILE_PATH is deprecated. Use DOCKERFILE_VARIANTS ?= $(DOCKERFILE_PATH) in the Makefile)
 endif
 
-DOCKER_ARCHS            ?= amd64
+DOCKER_ARCHS ?= amd64 arm64 armv7 ppc64le riscv64 s390x
+DOCKERFILE_ARCH_EXCLUSIONS ?=
+DOCKER_REGISTRY_ARCH_EXCLUSIONS ?= quay.io:riscv64
 DOCKERFILE_VARIANTS     ?= $(wildcard Dockerfile Dockerfile.*)
 
 # Function to extract variant from Dockerfile label.
diff --git a/SECURITY.md b/SECURITY.md
index fed02d85..5e6f976d 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -3,4 +3,4 @@
 The Prometheus security policy, including how to report vulnerabilities, can be
 found here:
 
-<https://prometheus.io/docs/operating/security/>
+[https://prometheus.io/docs/operating/security/](https://prometheus.io/docs/operating/security/)