diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-22 15:14:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 15:14:38 +0100 |
| commit | 901066acd113ee3bea709cc558d86c4c438e2f67 (patch) | |
| tree | 018a8f7918b50e9d1bc58f7ce9a981f628c3d295 /pkg/api | |
| parent | fc963159b8078c7e3ca6571174fb3a82d1023b43 (diff) | |
| parent | 06dd9136a253521cb74497a59f2e6894806a5b6d (diff) | |
| download | podman-901066acd113ee3bea709cc558d86c4c438e2f67.tar.gz podman-901066acd113ee3bea709cc558d86c4c438e2f67.tar.bz2 podman-901066acd113ee3bea709cc558d86c4c438e2f67.zip | |
Merge pull request #13580 from vrothberg/enable-linters
enable linters
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/compat/images_prune.go | 2 | ||||
| -rw-r--r-- | pkg/api/handlers/utils/images.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/images_prune.go b/pkg/api/handlers/compat/images_prune.go index 88776dc49..c0be9da7d 100644 --- a/pkg/api/handlers/compat/images_prune.go +++ b/pkg/api/handlers/compat/images_prune.go @@ -43,7 +43,7 @@ func PruneImages(w http.ResponseWriter, r *http.Request) { return } - idr := make([]types.ImageDeleteResponseItem, len(imagePruneReports)) + idr := make([]types.ImageDeleteResponseItem, 0, len(imagePruneReports)) var reclaimedSpace uint64 var errorMsg bytes.Buffer for _, p := range imagePruneReports { diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go index 15b16bc43..7154f5616 100644 --- a/pkg/api/handlers/utils/images.go +++ b/pkg/api/handlers/utils/images.go @@ -63,7 +63,7 @@ func IsRegistryReference(name string) error { imageRef, err := alltransports.ParseImageName(name) if err != nil { // No supported transport -> assume a docker-stype reference. - return nil + return nil // nolint: nilerr } if imageRef.Transport().Name() == docker.Transport.Name() { return nil |