Merge pull request #397 from jgehrcke/jp/invalidate-go-build-less-often

Invalidate go build cache layer less often

Author: jgehrcke

.dockerignore

@@ -1 +1,6 @@
-/deployments/container
+.dockerignore
+deployments/container
+*.tar
+*.tgz
+demo
+.git

deployments/container/Dockerfile

@@ -1,3 +1,7 @@
+# syntax=docker.io/docker/dockerfile:1.7-labs
+# The above enables the COPY --exclude flag, see:
+# https://github.com/moby/buildkit/pull/4561
+
 # Copyright (c) 2019-2025, NVIDIA CORPORATION.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,7 +50,16 @@ ENV GOPATH=/go
 ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
 
 WORKDIR /build
-COPY . .
+
+# Copy everything that is needed for the go build, but do not invalidate go
+# build artifact layer unnecessarily often. Note that --exclude only affects the
+# cache.
+COPY    --exclude=./templates/** \
+        --exclude=./deployments/helm/** \
+        --exclude=./hack/kubelet-plugin-prestart.sh \
+        --exclude=./demo/** \
+        --exclude=./Dockerfile \
+        . .
 
 RUN mkdir /artifacts
 
@@ -96,3 +109,4 @@ COPY --from=build   /artifacts/compute-domain-daemon         /usr/bin/compute-do
 COPY --from=build   /artifacts/gpu-kubelet-plugin            /usr/bin/gpu-kubelet-plugin
 COPY --from=build   /build/hack/kubelet-plugin-prestart.sh   /usr/bin/kubelet-plugin-prestart.sh
 COPY --from=build   /build/templates                         /templates
+COPY /templates /templates

deployments/container/Makefile

@@ -87,6 +87,7 @@ $(IMAGE_TARGETS): image-%:
 		--build-arg TOOLKIT_CONTAINER_IMAGE="$(TOOLKIT_CONTAINER_IMAGE)" \
 		--build-arg VERSION="$(VERSION)" \
 		--build-arg GIT_COMMIT="$(GIT_COMMIT)" \
+		--progress=plain \
 		-f $(DOCKERFILE) \
 		$(CURDIR)