summaryrefslogtreecommitdiff
path: root/pkg/bindings/images
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/bindings/images')
-rw-r--r--pkg/bindings/images/images.go19
-rw-r--r--pkg/bindings/images/types_diff_options.go4
-rw-r--r--pkg/bindings/images/types_export_options.go4
-rw-r--r--pkg/bindings/images/types_get_options.go4
-rw-r--r--pkg/bindings/images/types_history_options.go4
-rw-r--r--pkg/bindings/images/types_import_options.go4
-rw-r--r--pkg/bindings/images/types_list_options.go4
-rw-r--r--pkg/bindings/images/types_load_options.go4
-rw-r--r--pkg/bindings/images/types_prune_options.go4
-rw-r--r--pkg/bindings/images/types_pull_options.go4
-rw-r--r--pkg/bindings/images/types_push_options.go4
-rw-r--r--pkg/bindings/images/types_remove_options.go4
-rw-r--r--pkg/bindings/images/types_search_options.go4
-rw-r--r--pkg/bindings/images/types_tag_options.go4
-rw-r--r--pkg/bindings/images/types_tree_options.go4
-rw-r--r--pkg/bindings/images/types_untag_options.go4
16 files changed, 37 insertions, 42 deletions
diff --git a/pkg/bindings/images/images.go b/pkg/bindings/images/images.go
index 9beb493c8..ae6962c8c 100644
--- a/pkg/bindings/images/images.go
+++ b/pkg/bindings/images/images.go
@@ -12,6 +12,7 @@ import (
"github.com/containers/podman/v2/pkg/auth"
"github.com/containers/podman/v2/pkg/bindings"
"github.com/containers/podman/v2/pkg/domain/entities"
+ "github.com/containers/podman/v2/pkg/domain/entities/reports"
"github.com/pkg/errors"
)
@@ -112,20 +113,13 @@ func History(ctx context.Context, nameOrID string, options *HistoryOptions) ([]*
return history, response.Process(&history)
}
-func Load(ctx context.Context, r io.Reader, options *LoadOptions) (*entities.ImageLoadReport, error) {
- if options == nil {
- options = new(LoadOptions)
- }
+func Load(ctx context.Context, r io.Reader) (*entities.ImageLoadReport, error) {
var report entities.ImageLoadReport
conn, err := bindings.GetClient(ctx)
if err != nil {
return nil, err
}
- params, err := options.ToParams()
- if err != nil {
- return nil, err
- }
- response, err := conn.DoRequest(r, http.MethodPost, "/images/load", params, nil)
+ response, err := conn.DoRequest(r, http.MethodPost, "/images/load", nil, nil)
if err != nil {
return nil, err
}
@@ -163,9 +157,9 @@ func Export(ctx context.Context, nameOrIDs []string, w io.Writer, options *Expor
// Prune removes unused images from local storage. The optional filters can be used to further
// define which images should be pruned.
-func Prune(ctx context.Context, options *PruneOptions) ([]string, error) {
+func Prune(ctx context.Context, options *PruneOptions) ([]*reports.PruneReport, error) {
var (
- deleted []string
+ deleted []*reports.PruneReport
)
if options == nil {
options = new(PruneOptions)
@@ -182,7 +176,8 @@ func Prune(ctx context.Context, options *PruneOptions) ([]string, error) {
if err != nil {
return deleted, err
}
- return deleted, response.Process(&deleted)
+ err = response.Process(&deleted)
+ return deleted, err
}
// Tag adds an additional name to locally-stored image. Both the tag and repo parameters are required.
diff --git a/pkg/bindings/images/types_diff_options.go b/pkg/bindings/images/types_diff_options.go
index d27c8945e..34a5bf2df 100644
--- a/pkg/bindings/images/types_diff_options.go
+++ b/pkg/bindings/images/types_diff_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:26.320022698 -0600 CST m=+0.000277796
*/
// Changed
@@ -39,6 +38,7 @@ func (o *DiffOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_export_options.go b/pkg/bindings/images/types_export_options.go
index 078b27fc0..172cb2b5c 100644
--- a/pkg/bindings/images/types_export_options.go
+++ b/pkg/bindings/images/types_export_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:27.173810543 -0600 CST m=+0.000239871
*/
// Changed
@@ -39,6 +38,7 @@ func (o *ExportOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_get_options.go b/pkg/bindings/images/types_get_options.go
index 1161657f7..c91ddb170 100644
--- a/pkg/bindings/images/types_get_options.go
+++ b/pkg/bindings/images/types_get_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:26.609005517 -0600 CST m=+0.000241828
*/
// Changed
@@ -39,6 +38,7 @@ func (o *GetOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_history_options.go b/pkg/bindings/images/types_history_options.go
index 6f9854e03..bd4224cd8 100644
--- a/pkg/bindings/images/types_history_options.go
+++ b/pkg/bindings/images/types_history_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:26.890854681 -0600 CST m=+0.000243668
*/
// Changed
@@ -39,6 +38,7 @@ func (o *HistoryOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_import_options.go b/pkg/bindings/images/types_import_options.go
index f5e6c8f7e..81eda946e 100644
--- a/pkg/bindings/images/types_import_options.go
+++ b/pkg/bindings/images/types_import_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:27.740585278 -0600 CST m=+0.000340441
*/
// Changed
@@ -39,6 +38,7 @@ func (o *ImportOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_list_options.go b/pkg/bindings/images/types_list_options.go
index 209d72e34..5dc4242fc 100644
--- a/pkg/bindings/images/types_list_options.go
+++ b/pkg/bindings/images/types_list_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:26.462967928 -0600 CST m=+0.000289760
*/
// Changed
@@ -39,6 +38,7 @@ func (o *ListOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_load_options.go b/pkg/bindings/images/types_load_options.go
index 6bba573d4..7bbd56c09 100644
--- a/pkg/bindings/images/types_load_options.go
+++ b/pkg/bindings/images/types_load_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:27.031848205 -0600 CST m=+0.000279409
*/
// Changed
@@ -39,6 +38,7 @@ func (o *LoadOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_prune_options.go b/pkg/bindings/images/types_prune_options.go
index c29fdae12..c290bb379 100644
--- a/pkg/bindings/images/types_prune_options.go
+++ b/pkg/bindings/images/types_prune_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:27.316938584 -0600 CST m=+0.000239843
*/
// Changed
@@ -39,6 +38,7 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_pull_options.go b/pkg/bindings/images/types_pull_options.go
index 07f3e079d..5163a6341 100644
--- a/pkg/bindings/images/types_pull_options.go
+++ b/pkg/bindings/images/types_pull_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
"github.com/containers/common/pkg/config"
jsoniter "github.com/json-iterator/go"
@@ -12,8 +13,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:28.164648348 -0600 CST m=+0.000243264
*/
// Changed
@@ -40,6 +39,7 @@ func (o *PullOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_push_options.go b/pkg/bindings/images/types_push_options.go
index f9ce1b835..15210f30b 100644
--- a/pkg/bindings/images/types_push_options.go
+++ b/pkg/bindings/images/types_push_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:27.881232044 -0600 CST m=+0.000242458
*/
// Changed
@@ -39,6 +38,7 @@ func (o *PushOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_remove_options.go b/pkg/bindings/images/types_remove_options.go
index c9692c2b7..66a6bea7d 100644
--- a/pkg/bindings/images/types_remove_options.go
+++ b/pkg/bindings/images/types_remove_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:26.180391541 -0600 CST m=+0.000290244
*/
// Changed
@@ -39,6 +38,7 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_search_options.go b/pkg/bindings/images/types_search_options.go
index e6168ac33..299d27505 100644
--- a/pkg/bindings/images/types_search_options.go
+++ b/pkg/bindings/images/types_search_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:28.023569573 -0600 CST m=+0.000245548
*/
// Changed
@@ -39,6 +38,7 @@ func (o *SearchOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_tag_options.go b/pkg/bindings/images/types_tag_options.go
index f6396e590..40cd4a35b 100644
--- a/pkg/bindings/images/types_tag_options.go
+++ b/pkg/bindings/images/types_tag_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:27.457906682 -0600 CST m=+0.000245071
*/
// Changed
@@ -39,6 +38,7 @@ func (o *TagOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_tree_options.go b/pkg/bindings/images/types_tree_options.go
index fb2493f85..a671fa4e0 100644
--- a/pkg/bindings/images/types_tree_options.go
+++ b/pkg/bindings/images/types_tree_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:26.749625305 -0600 CST m=+0.000267624
*/
// Changed
@@ -39,6 +38,7 @@ func (o *TreeOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
diff --git a/pkg/bindings/images/types_untag_options.go b/pkg/bindings/images/types_untag_options.go
index 8faf5c14e..e38c5f18e 100644
--- a/pkg/bindings/images/types_untag_options.go
+++ b/pkg/bindings/images/types_untag_options.go
@@ -4,6 +4,7 @@ import (
"net/url"
"reflect"
"strconv"
+ "strings"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
@@ -11,8 +12,6 @@ import (
/*
This file is generated automatically by go generate. Do not edit.
-
-Created 2020-12-18 15:58:27.600379913 -0600 CST m=+0.000251449
*/
// Changed
@@ -39,6 +38,7 @@ func (o *UntagOptions) ToParams() (url.Values, error) {
if !o.Changed(fieldName) {
continue
}
+ fieldName = strings.ToLower(fieldName)
f := s.Field(i)
if reflect.Ptr == f.Kind() {
f = f.Elem()
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-27 21:29:46 +0000