#14: move image remove to defer (#19)

#14: move image remove to defer, set force remove option

Author: iignatevich

pkg/action/env.container.go

@@ -243,14 +243,17 @@ func (c *containerEnv) Execute(ctx context.Context, a *Action) (err error) {
 		}
 	}
 
-	if c.removeImg {
+	defer func() {
+		if !c.removeImg {
+			return
+		}
 		err = c.imageRemove(ctx, a)
 		if err != nil {
 			log.Err("Image remove returned an error: %v", err)
 		} else {
 			cli.Println("Image %q was successfully removed", a.ActionDef().Image)
 		}
-	}
+	}()
 
 	return err
 }
@@ -275,7 +278,7 @@ func (c *containerEnv) Close() error {
 
 func (c *containerEnv) imageRemove(ctx context.Context, a *Action) error {
 	_, err := c.driver.ImageRemove(ctx, a.ActionDef().Image, types.ImageRemoveOptions{
-		Force:         false,
+		Force:         true,
 		PruneChildren: false,
 	})
 

pkg/action/env.container_test.go

@@ -252,7 +252,7 @@ func Test_ContainerExec_imageRemove(t *testing.T) {
 			assert.NoError(err)
 
 			a := act.ActionDef()
-			imgOpts := types.ImageRemoveOptions{Force: false, PruneChildren: false}
+			imgOpts := types.ImageRemoveOptions{Force: true, PruneChildren: false}
 			d.EXPECT().
 				ImageRemove(ctx, a.Image, gomock.Eq(imgOpts)).
 				Return(tt.ret...)