diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-14 07:18:52 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-14 07:18:52 -0400 |
commit | 001f619eab780721abe52ee72fe3c87caa7c652f (patch) | |
tree | e221f394a1a3f583f315494ca300160fa52ab2f2 /pkg/api | |
parent | 15712c76fb198cec7509ff0cf401e357401d2d7d (diff) | |
parent | 97f93dc78e61820196f2adcc06ab8ec145ef6703 (diff) | |
download | podman-001f619eab780721abe52ee72fe3c87caa7c652f.tar.gz podman-001f619eab780721abe52ee72fe3c87caa7c652f.tar.bz2 podman-001f619eab780721abe52ee72fe3c87caa7c652f.zip |
Merge pull request #13872 from vrothberg/revert-size
Revert "images --size"
Diffstat (limited to 'pkg/api')
-rw-r--r-- | pkg/api/handlers/compat/images.go | 5 | ||||
-rw-r--r-- | pkg/api/server/register_images.go | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go index ea2df4a73..edefce010 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -415,9 +415,8 @@ func GetImages(w http.ResponseWriter, r *http.Request) { All bool Digests bool Filter string // Docker 1.24 compatibility - Size bool }{ - Size: true, + // This is where you can override the golang default value for one of fields } if err := decoder.Decode(&query, r.URL.Query()); err != nil { @@ -444,7 +443,7 @@ func GetImages(w http.ResponseWriter, r *http.Request) { imageEngine := abi.ImageEngine{Libpod: runtime} - listOptions := entities.ImageListOptions{All: query.All, Filter: filterList, Size: query.Size} + listOptions := entities.ImageListOptions{All: query.All, Filter: filterList} summaries, err := imageEngine.List(r.Context(), listOptions) if err != nil { utils.Error(w, http.StatusInternalServerError, err) diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go index 2ed7aa054..89f808e7d 100644 --- a/pkg/api/server/register_images.go +++ b/pkg/api/server/register_images.go @@ -840,11 +840,6 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error { // - `id`=(`<image-id>`) // - `since`=(`<image-name>[:<tag>]`, `<image id>` or `<image@digest>`) // type: string - // - name: size - // in: query - // description: Compute the size of each image - // type: boolean - // default: true // produces: // - application/json // responses: |