From c30b596c1f97f7002b2df1ea52092f41ed0dcd54 Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Fri, 10 Apr 2026 07:19:58 +0200 Subject: [PATCH] Fix dockerignore sync (#18488) Add `.dockerignore` to the always sync file list. * Sort container archs. Signed-off-by: SuperQ --- .dockerignore | 4 ++-- Makefile.common | 2 +- scripts/sync_repo_files.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.dockerignore b/.dockerignore index c528ea1189..0967099155 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,8 +3,8 @@ data/ .tarballs/ !.build/linux-amd64/ -!.build/linux-armv7/ !.build/linux-arm64/ +!.build/linux-armv7/ !.build/linux-ppc64le/ -!.build/linux-s390x/ !.build/linux-riscv64/ +!.build/linux-s390x/ diff --git a/Makefile.common b/Makefile.common index 9079508462..af20f5935e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -90,7 +90,7 @@ ifdef DOCKERFILE_PATH $(error DOCKERFILE_PATH is deprecated. Use DOCKERFILE_VARIANTS ?= $(DOCKERFILE_PATH) in the Makefile) endif -DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le riscv64 s390x +DOCKER_ARCHS ?= amd64 arm64 armv7 ppc64le riscv64 s390x DOCKERFILE_ARCH_EXCLUSIONS ?= DOCKER_REGISTRY_ARCH_EXCLUSIONS ?= quay.io:riscv64 DOCKERFILE_VARIANTS ?= $(wildcard Dockerfile Dockerfile.*) diff --git a/scripts/sync_repo_files.sh b/scripts/sync_repo_files.sh index d5a7ac3e85..8c143ec177 100755 --- a/scripts/sync_repo_files.sh +++ b/scripts/sync_repo_files.sh @@ -166,7 +166,7 @@ process_repo() { if [[ -z "${target_file}" ]]; then repo_log "${target_filename} doesn't exist in ${org_repo}" case "${source_file}" in - CODE_OF_CONDUCT.md | SECURITY.md | .github/workflows/container_description.yml) + CODE_OF_CONDUCT.md | SECURITY.md | .dockerignore | .github/workflows/container_description.yml) repo_log_yellow "${source_file} missing in ${org_repo}, force updating." needs_update+=("${source_file}") ;;