mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2026-05-04 20:06:12 +02:00
Code Issues Projects Releases Wiki Activity

Update common container archs

Browse Source 
Promote the Prometheus container archs settings to common so they
are used by default on other projects.
* Add `.dockerignore` to sync script to include docker archs.

Signed-off-by: SuperQ <superq@gmail.com>
This commit is contained in:
SuperQ 2026-04-08 14:33:06 +02:00
parent 54d89fdd0a
commit f186cfdad1
No known key found for this signature in database
GPG Key ID: C646B23C9E3245F1
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -12,10 +12,6 @@
# limitations under the License.
# Needs to be defined before including Makefile.common to auto-generate targets
DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le riscv64 s390x
DOCKERFILE_ARCH_EXCLUSIONS ?= Dockerfile.distroless:riscv64
DOCKER_REGISTRY_ARCH_EXCLUSIONS ?= quay.io:riscv64
UI_PATH = web/ui
BUILD_UI ?= all
UI_NODE_MODULES_PATH = $(UI_PATH)/node_modules

4
Makefile.common
View File

@ -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 armv7 arm64 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.

14
scripts/sync_repo_files.sh
View File

@ -53,7 +53,7 @@ if [ -z "${GITHUB_TOKEN}" ]; then
fi
# List of files that should be synced.
SYNC_FILES="CODE_OF_CONDUCT.md LICENSE Makefile.common SECURITY.md .yamllint scripts/golangci-lint.yml .github/workflows/scorecards.yml .github/workflows/container_description.yml .github/workflows/stale.yml"
SYNC_FILES="CODE_OF_CONDUCT.md LICENSE Makefile.common SECURITY.md .dockerignore .yamllint scripts/golangci-lint.yml .github/workflows/scorecards.yml .github/workflows/container_description.yml .github/workflows/stale.yml"
# Go to the root of the repo
cd "$(git rev-parse --show-cdup)" || exit 1
@ -144,9 +144,15 @@ process_repo() {
repo_log "${org_repo} is not Go, skipping golangci-lint.yml."
continue
fi
if [[ "${source_file}" == '.github/workflows/container_description.yml' ]] && ! check_docker "${org_repo}" "${default_branch}" ; then
repo_log "${org_repo} has no Dockerfile, skipping container_description.yml."
continue
if ! check_docker "${org_repo}" "${default_branch}" ; then
if [[ "${source_file}" == '.dockerignore' ]] ; then
repo_log "${org_repo} has no Dockerfile, skipping .dockerignore."
continue
fi
if [[ "${source_file}" == '.github/workflows/container_description.yml' ]] ; then
repo_log "${org_repo} has no Dockerfile, skipping container_description.yml."
continue
fi
fi
if [[ "${source_file}" == 'LICENSE' ]] && ! check_license "${target_file}" ; then
repo_log "LICENSE in ${org_repo} is not apache, skipping."