diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-02 18:19:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-02 18:19:24 +0100 |
| commit | e63e90999c88c7e8c9193c98df962e47001adb0f (patch) | |
| tree | a60243c69d6febb0f813a609a469014b451d8405 /pkg/domain | |
| parent | 0d5aef47d3b5322d8d7d876a27ff06b5eb71c97a (diff) | |
| parent | d0dfc5e2234a3567addd8163a0bd6a3f03d740cc (diff) | |
| download | podman-e63e90999c88c7e8c9193c98df962e47001adb0f.tar.gz podman-e63e90999c88c7e8c9193c98df962e47001adb0f.tar.bz2 podman-e63e90999c88c7e8c9193c98df962e47001adb0f.zip | |
Merge pull request #12156 from matejvasek/docker-api-zero-value-fixes
Fix libpod API conformance to swagger
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/reports/prune.go | 6 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/domain/entities/reports/prune.go b/pkg/domain/entities/reports/prune.go index 5494ac3ae..219e35b67 100644 --- a/pkg/domain/entities/reports/prune.go +++ b/pkg/domain/entities/reports/prune.go @@ -1,9 +1,9 @@ package reports type PruneReport struct { - Id string //nolint - Err error - Size uint64 + Id string `json:"Id"` //nolint + Err error `json:"Err,omitempty"` + Size uint64 `json:"Size"` } func PruneReportsIds(r []*PruneReport) []string { diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 8878bf128..7aa202334 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -57,7 +57,7 @@ func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOption pruneOptions.Filters = append(pruneOptions.Filters, "containers=false") } - var pruneReports []*reports.PruneReport + pruneReports := make([]*reports.PruneReport, 0) // Now prune all images until we converge. numPreviouslyRemovedImages := 1 |