summaryrefslogtreecommitdiff
path: root/pkg/api/handlers/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-01-28 14:37:30 -0500
committerGitHub <noreply@github.com>2021-01-28 14:37:30 -0500
commita4c255a939cf340978efd9cb070951029237c8cf (patch)
treed16359f9307cc94afd14f1721e465366e387d670 /pkg/api/handlers/libpod
parentfb653c43ed1eb9eb9b97ca80edb8df6caab88905 (diff)
parent84f7bdc4dbadee3101f61c7953b13e48de158093 (diff)
downloadpodman-a4c255a939cf340978efd9cb070951029237c8cf.tar.gz
podman-a4c255a939cf340978efd9cb070951029237c8cf.tar.bz2
podman-a4c255a939cf340978efd9cb070951029237c8cf.zip
Merge pull request #9115 from rhatdan/pull
Switch podman image push handlers to use abi
Diffstat (limited to 'pkg/api/handlers/libpod')
-rw-r--r--pkg/api/handlers/libpod/manifests.go12
1 files changed, 4 insertions, 8 deletions
diff --git a/pkg/api/handlers/libpod/manifests.go b/pkg/api/handlers/libpod/manifests.go
index 35221ecf1..ded51a31f 100644
--- a/pkg/api/handlers/libpod/manifests.go
+++ b/pkg/api/handlers/libpod/manifests.go
@@ -147,7 +147,6 @@ func ManifestPush(w http.ResponseWriter, r *http.Request) {
query := struct {
All bool `schema:"all"`
Destination string `schema:"destination"`
- Format string `schema:"format"`
TLSVerify bool `schema:"tlsVerify"`
}{
// Add defaults here once needed.
@@ -163,24 +162,21 @@ func ManifestPush(w http.ResponseWriter, r *http.Request) {
}
source := utils.GetName(r)
- authConf, authfile, key, err := auth.GetCredentials(r)
+ authconf, authfile, key, err := auth.GetCredentials(r)
if err != nil {
utils.Error(w, "failed to retrieve repository credentials", http.StatusBadRequest, errors.Wrapf(err, "failed to parse %q header for %s", key, r.URL.String()))
return
}
defer auth.RemoveAuthfile(authfile)
var username, password string
- if authConf != nil {
- username = authConf.Username
- password = authConf.Password
-
+ if authconf != nil {
+ username = authconf.Username
+ password = authconf.Password
}
-
options := entities.ImagePushOptions{
Authfile: authfile,
Username: username,
Password: password,
- Format: query.Format,
All: query.All,
}
if sys := runtime.SystemContext(); sys != nil {