Skip to content

Commit

Permalink
Disable BuildKit's InvalidDefaultArgInFrom build check
Browse files Browse the repository at this point in the history
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 <twieczorek@mirantis.com>
  • Loading branch information
twz123 committed Dec 20, 2024
1 parent 9fd75e3 commit e42ca53
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion embedded-bins/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)" \
Expand Down

0 comments on commit e42ca53

Please sign in to comment.