MergeInto should include Volumes (#1376)

We were dropping these :( Signed-off-by: Jon Johnson <jon.johnson@chainguard.dev>
chainguard-dev · Oct 29, 2024 · 6a3e0cb · 6a3e0cb
1 parent 48f3c87
commit 6a3e0cb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/pkg/build/types/image_configuration.go b/pkg/build/types/image_configuration.go
@@ -145,6 +145,8 @@ func (ic *ImageConfiguration) MergeInto(target *ImageConfiguration) error {
 		}
 	}
 
+	target.Volumes = slices.Concat(ic.Volumes, target.Volumes)
+
 	// Update the contents.
 	return ic.Contents.MergeInto(&target.Contents)
 }

diff --git a/pkg/build/types/image_configuration_test.go b/pkg/build/types/image_configuration_test.go
@@ -78,6 +78,9 @@ func TestMergeInto(t *testing.T) {
 				"org.extra": "foo",
 				"org.blah":  "foo",
 			},
+			Volumes: []string{
+				"volume1",
+			},
 		},
 		target: types.ImageConfiguration{
 			Contents: types.ImageContents{
@@ -102,6 +105,9 @@ func TestMergeInto(t *testing.T) {
 				"org.extra": "foo",
 				"org.blah":  "foo",
 			},
+			Volumes: []string{
+				"volume1",
+			},
 		},
 	}, {
 		name: "simple blend of contents",