Added simple logic for dry run on prune containers

moby · kaushik94 · kaushik94 · kaushik94 · Sep 14, 2020 · kaushik94
diff --git a/daemon/prune.go b/daemon/prune.go
@@ -26,6 +26,7 @@ var (
 		"label":  true,
 		"label!": true,
 		"until":  true,
+		"dryRun": true,
 func (s *containerRouter) postContainersPrune(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { 
 	if err := httputils.ParseForm(r); err != nil { 
 		return err 
 	} 
  
 	pruneFilters, err := filters.FromJSON(r.Form.Get("filters")) 
 	if err != nil { 
 		return errdefs.InvalidParameter(err) 
 	} 
  
 	pruneReport, err := s.backend.ContainersPrune(ctx, pruneFilters) 
 	if err != nil { 
 		return err 
 	} 
 	return httputils.WriteJSON(w, http.StatusOK, pruneReport) 
 } 
 ContainersPrune(ctx context.Context, pruneFilters filters.Args) (*types.ContainersPruneReport, error) 
 func (cli *Client) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (types.ContainersPruneReport, error) { 
 	var report types.ContainersPruneReport 
  
 	if err := cli.NewVersionError("1.25", "container prune"); err != nil { 
 		return report, err 
 	} 
  
 	query, err := getFiltersQuery(pruneFilters) 
 	if err != nil { 
 		return report, err 
 	} 
  
 	serverResp, err := cli.post(ctx, "/containers/prune", query, nil, nil) 
 	defer ensureReaderClosed(serverResp) 
 	if err != nil { 
 		return report, err 
 	} 
  
 	if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil { 
 		return report, fmt.Errorf("Error retrieving disk usage: %v", err) 
 	} 
  
 	return report, nil 
 } 
diff --git a/daemon/prune.go b/daemon/prune.go
-			}
-			if cSize > 0 {
-				rep.SpaceReclaimed += uint64(cSize)
+			if (!dryRunMode) {
-			if (!dryRunMode) {
+			if !dryRunMode {
+				if err := daemon.ContainerRm(c.ID, &types.ContainerRmConfig{}); err != nil {
+					logrus.Warnf("failed to prune container %s: %v", c.ID, err)
+					continue
+				}
+			}
+			if cSize > 0 {
+				rep.SpaceReclaimed += uint64(cSize)
+			}
+			rep.ContainersDeleted = append(rep.ContainersDeleted, c.ID)
	func (s containerRouter) postContainersPrune(ctx context.Context, w http.ResponseWriter, r http.Request, vars map[string]string) error {
	if err := httputils.ParseForm(r); err != nil {
	return err
	}

	pruneFilters, err := filters.FromJSON(r.Form.Get("filters"))
	if err != nil {
	return errdefs.InvalidParameter(err)
	}

	pruneReport, err := s.backend.ContainersPrune(ctx, pruneFilters)
	if err != nil {
	return err
	}
	return httputils.WriteJSON(w, http.StatusOK, pruneReport)
	}
	func (cli *Client) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (types.ContainersPruneReport, error) {
	var report types.ContainersPruneReport

	if err := cli.NewVersionError("1.25", "container prune"); err != nil {
	return report, err
	}

	query, err := getFiltersQuery(pruneFilters)
	if err != nil {
	return report, err
	}

	serverResp, err := cli.post(ctx, "/containers/prune", query, nil, nil)
	defer ensureReaderClosed(serverResp)
	if err != nil {
	return report, err
	}

	if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil {
	return report, fmt.Errorf("Error retrieving disk usage: %v", err)
	}

	return report, nil
	}