From e42ca53b96aa2ef0156238d269fc486af9beba2f Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Fri, 20 Dec 2024 09:46:35 +0100 Subject: [PATCH] Disable BuildKit's InvalidDefaultArgInFrom build check The BUILDIMAGE argument has no default value by design, since it always comes from the Makefile. So disable the check. Signed-off-by: Tom Wieczorek --- embedded-bins/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/embedded-bins/Makefile b/embedded-bins/Makefile index cac213d0be31..a0a32676d158 100644 --- a/embedded-bins/Makefile +++ b/embedded-bins/Makefile @@ -61,7 +61,7 @@ $(bindir)/xtables-legacy-multi: .container.iptables $(bindir)/xtables-nft-multi: .container.iptables $(bindir)/keepalived: .container.keepalived -$(bindir)/kubelet.exe $(bindir)/kube-proxy.exe: .container.kubernetes.windows +$(bindir)/kubelet.exe $(bindir)/kube-proxy.exe: .container.kubernetes.windows $(bindir)/containerd.exe $(bindir)/containerd-shim-runhcs-v1.exe: .container.containerd.windows $(addprefix $(bindir)/, $(bins)): | $(bindir) @@ -84,6 +84,7 @@ build_docker_container = \ build_docker_image = \ docker build --progress=plain --iidfile '$@' -t k0sbuild$(basename $@):latest \ + --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \ --build-arg TARGET_OS=$(if $(findstring .windows.stamp,$@),windows,linux) \ --build-arg CONTAINERD_BINS="$(containerd_bins)" \ --build-arg KUBERNETES_BINS="$(kubernetes_bins)" \