From 620ee480f4f02f9f4facf60d61f3f10ed4833e19 Mon Sep 17 00:00:00 2001 From: Natalie Arellano Date: Thu, 5 Sep 2024 13:16:43 -0400 Subject: [PATCH] Fix deletion of ephemeral builder `createEphemeralBuilder` mutates the provided `rawBuilderImage`, so we must save the image name before this method is called. Signed-off-by: Natalie Arellano --- pkg/client/build.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/client/build.go b/pkg/client/build.go index 901c0865a..50867e66c 100644 --- a/pkg/client/build.go +++ b/pkg/client/build.go @@ -535,6 +535,7 @@ func (c *Client) Build(ctx context.Context, opts BuildOptions) error { buildEnvs[k] = v } + origBuilderName := rawBuilderImage.Name() ephemeralBuilder, err := c.createEphemeralBuilder( rawBuilderImage, buildEnvs, @@ -549,7 +550,7 @@ func (c *Client) Build(ctx context.Context, opts BuildOptions) error { return err } defer func() { - if ephemeralBuilder.Name() == rawBuilderImage.Name() { + if ephemeralBuilder.Name() == origBuilderName { return } _, _ = c.docker.ImageRemove(context.Background(), ephemeralBuilder.Name(), types.RemoveOptions{Force: true})