summaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-16 11:05:33 +0200
committerGitHub <noreply@github.com>2020-09-16 11:05:33 +0200
commit0d14d7b7152ac7a0856fcbb2bbc0f7238ab182d6 (patch)
treebbb75dd846015cb33e2a96b1ea9a6c4ec0d62859 /pkg/api
parentb9c47fa40bc503e155a528174974293c6b053ec2 (diff)
parent2fcd1d7b4dca2619277607da7c8d22e9ec7620a2 (diff)
downloadpodman-0d14d7b7152ac7a0856fcbb2bbc0f7238ab182d6.tar.gz
podman-0d14d7b7152ac7a0856fcbb2bbc0f7238ab182d6.tar.bz2
podman-0d14d7b7152ac7a0856fcbb2bbc0f7238ab182d6.zip
Merge pull request #7624 from QiWang19/policy-option
Supports import&run--signature-policy
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/handlers/compat/images.go2
-rw-r--r--pkg/api/handlers/libpod/images.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
index 8765e20ca..c1ba9ca66 100644
--- a/pkg/api/handlers/compat/images.go
+++ b/pkg/api/handlers/compat/images.go
@@ -205,7 +205,7 @@ func CreateImageFromSrc(w http.ResponseWriter, r *http.Request) {
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "failed to write temporary file"))
}
}
- iid, err := runtime.Import(r.Context(), source, "", query.Changes, "", false)
+ iid, err := runtime.Import(r.Context(), source, "", "", query.Changes, "", false)
if err != nil {
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "unable to import tarball"))
return
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
index 85f7903dc..1da41ad88 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -391,7 +391,7 @@ func ImagesImport(w http.ResponseWriter, r *http.Request) {
tmpfile.Close()
source = tmpfile.Name()
}
- importedImage, err := runtime.Import(context.Background(), source, query.Reference, query.Changes, query.Message, true)
+ importedImage, err := runtime.Import(context.Background(), source, query.Reference, "", query.Changes, query.Message, true)
if err != nil {
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "unable to import image"))
return