Use registry cache only from LastBuid.Cache

buildpacks-community · Aug 23, 2021 · 4f4f13f · 4f4f13f
1 parent 7eb503a
commit 4f4f13f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/pkg/apis/build/v1alpha2/build_pod.go b/pkg/apis/build/v1alpha2/build_pod.go
@@ -169,10 +169,9 @@ func (b *Build) BuildPod(images BuildPodImages, secrets []corev1.Secret, taints
 	if (!b.Spec.NeedVolumeCache() && !b.Spec.NeedRegistryCache()) || config.OS == "windows" {
 		genericCacheArgs = nil
 	} else if b.Spec.NeedRegistryCache() {
-		if b.Spec.LastBuild != nil && b.Spec.LastBuild.Cache.Image != "" {
+		useCacheFromLastBuild := (b.Spec.LastBuild != nil && b.Spec.LastBuild.Cache.Image != "")
+		if useCacheFromLastBuild {
 			genericCacheArgs = []string{fmt.Sprintf("-cache-image=%s", b.Spec.LastBuild.Cache.Image)}
-		} else {
-			genericCacheArgs = []string{fmt.Sprintf("-cache-image=%s", b.Spec.Cache.Registry.ImageTag)}
 		}
 		exporterCacheArgs = []string{fmt.Sprintf("-cache-image=%s", b.Spec.Cache.Registry.ImageTag)}
 	} else {

diff --git a/samples/image_with_cache.yaml b/samples/image_with_cache.yaml
@@ -32,4 +32,4 @@ spec:
   source:
     git:
       url: https://github.com/buildpack/sample-java-app.git
-      revision: master
+      revision: master