From 31bffe0ec3c14e91dac1d7599f475a5a167ec981 Mon Sep 17 00:00:00 2001 From: Dragan Milic Date: Tue, 5 Nov 2019 11:32:39 +0000 Subject: [PATCH] docker build: remove image by ID, not tag --- resource/docker/build/docker_build_resource.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resource/docker/build/docker_build_resource.go b/resource/docker/build/docker_build_resource.go index cb5a11c..73c1f5e 100644 --- a/resource/docker/build/docker_build_resource.go +++ b/resource/docker/build/docker_build_resource.go @@ -167,9 +167,12 @@ func resourceDelete(d *schema.ResourceData, m interface{}) error { return errors.Wrap(err, "while creating docker client") } - sourceHash := d.Get("source_hash").(string) + imageID := d.Get("image_id").(string) + _, _, err = dc.ImageInspectWithRaw(context.Background(), imageID) - imageID := fmt.Sprintf("sourcebuild:%s", sourceHash) + if client.IsErrNotFound(err) { + return nil + } _, err = dc.ImageRemove(context.Background(), imageID, types.ImageRemoveOptions{ PruneChildren: true,