Pass previous image explicitly and fix tag slice

buildpacks-community · Nov 23, 2021 · 8907075 · 8907075
1 parent 6091b51
commit 8907075
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/pkg/apis/build/v1alpha2/build_pod.go b/pkg/apis/build/v1alpha2/build_pod.go
@@ -235,14 +235,19 @@ func (b *Build) BuildPod(images BuildPodImages, buildContext BuildContext) (*cor
 					return []string{}
 				}
 				tags := []string{}
-				for _, tag := range b.Spec.Tags {
-					tags = append(tags, "-tag="+tag)
+				if len(b.Spec.Tags) > 1 {
+					for _, tag := range b.Spec.Tags[1:] {
+						tags = append(tags, "-tag="+tag)
+					}
 				}
 				return tags
 			}(),
 			func() []string {
 				if b.Spec.LastBuild != nil && b.Spec.LastBuild.Image != "" {
-					return []string{b.Spec.LastBuild.Image}
+					if platformAPILessThan07 {
+						return []string{b.Spec.LastBuild.Image}
+					}
+					return []string{"-previous-image=" + b.Spec.LastBuild.Image, b.Tag()}
 				}
 				return []string{b.Tag()}
 			}(),

diff --git a/pkg/apis/build/v1alpha2/build_pod_test.go b/pkg/apis/build/v1alpha2/build_pod_test.go
@@ -836,14 +836,14 @@ func testBuildPod(t *testing.T, when spec.G, it spec.S) {
 				"home-dir",
 			}, names(pod.Spec.InitContainers[1].VolumeMounts))
 			tags := []string{}
-			for _, tag := range build.Spec.Tags {
+			for _, tag := range build.Spec.Tags[1:] {
 				tags = append(tags, "-tag="+tag)
 			}
 			assert.Equal(t, append(append([]string{
 				"-layers=/layers",
 				"-analyzed=/layers/analyzed.toml"},
 				tags...),
-				build.Spec.LastBuild.Image), pod.Spec.InitContainers[1].Args)
+				"-previous-image="+build.Spec.LastBuild.Image, build.Tag()), pod.Spec.InitContainers[1].Args)
 		})
 
 		it("configures analyze step with the older api", func() {
@@ -882,7 +882,7 @@ func testBuildPod(t *testing.T, when spec.G, it spec.S) {
 				"home-dir",
 			}, names(pod.Spec.InitContainers[1].VolumeMounts))
 			tags := []string{}
-			for _, tag := range build.Spec.Tags {
+			for _, tag := range build.Spec.Tags[1:] {
 				tags = append(tags, "-tag="+tag)
 			}
 			assert.Equal(t, append(append([]string{
@@ -2201,7 +2201,7 @@ func testBuildPod(t *testing.T, when spec.G, it spec.S) {
 				})
 				assert.Equal(t, []string{"/networkWait/network-wait-launcher"}, analyzeContainer.Command)
 				tags := []string{}
-				for _, tag := range build.Spec.Tags {
+				for _, tag := range build.Spec.Tags[1:] {
 					tags = append(tags, "-tag="+tag)
 				}
 				assert.Equal(t, append(append([]string{
@@ -2210,7 +2210,7 @@ func testBuildPod(t *testing.T, when spec.G, it spec.S) {
 					"/cnb/lifecycle/analyzer",
 					"-layers=/layers",
 					"-analyzed=/layers/analyzed.toml"}, tags...),
-					"someimage/name@sha256:previous"), analyzeContainer.Args)
+					"-previous-image=someimage/name@sha256:previous", "someimage/name"), analyzeContainer.Args)
 			})
 
 			it("configures restore step", func() {