opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5247 from schubter/5242

Browse Source 
APIv2: fixes decoder issue
This commit is contained in:
OpenShift Merge Robot
2020-02-19 03:45:02 +01:00
committed by GitHub
parent c58926e54b 4b96c3b2c8
commit 1bed53b02c
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
pkg/api/handlers/generic/images.go
View File

@ -106,14 +106,14 @@ func CommitContainer(w http.ResponseWriter, r *http.Request) {
runtime := r.Context().Value("runtime").(*libpod.Runtime) runtime := r.Context().Value("runtime").(*libpod.Runtime)
query := struct { query := struct {
author string Author string `schema:"author"`
changes string Changes string `schema:"changes"`
comment string Comment string `schema:"comment"`
container string Container string `schema:"container"`
//fromSrc string # fromSrc is currently unused //fromSrc string # fromSrc is currently unused
pause bool Pause bool `schema:"pause"`
repo string Repo string `schema:"repo"`
tag string Tag string `schema:"tag"`
}{ }{
// This is where you can override the golang default value for one of fields // This is where you can override the golang default value for one of fields
} }
@ -145,22 +145,22 @@ func CommitContainer(w http.ResponseWriter, r *http.Request) {
return return
} }
if len(query.tag) > 0 { if len(query.Tag) > 0 {
tag = query.tag tag = query.Tag
} }
options.Message = query.comment options.Message = query.Comment
options.Author = query.author options.Author = query.Author
options.Pause = query.pause options.Pause = query.Pause
options.Changes = strings.Fields(query.changes) options.Changes = strings.Fields(query.Changes)
ctr, err := runtime.LookupContainer(query.container) ctr, err := runtime.LookupContainer(query.Container)
if err != nil { if err != nil {
utils.Error(w, "Something went wrong.", http.StatusNotFound, err) utils.Error(w, "Something went wrong.", http.StatusNotFound, err)
return return
} }
// I know mitr hates this ... but doing for now // I know mitr hates this ... but doing for now
if len(query.repo) > 1 { if len(query.Repo) > 1 {
destImage = fmt.Sprintf("%s:%s", query.repo, tag) destImage = fmt.Sprintf("%s:%s", query.Repo, tag)
} }
commitImage, err := ctr.Commit(r.Context(), destImage, options) commitImage, err := ctr.Commit(r.Context(), destImage, options)
@ -179,8 +179,8 @@ func CreateImageFromSrc(w http.ResponseWriter, r *http.Request) {
runtime := r.Context().Value("runtime").(*libpod.Runtime) runtime := r.Context().Value("runtime").(*libpod.Runtime)
query := struct { query := struct {
fromSrc string FromSrc string `schema:"fromSrc"`
changes []string Changes []string `schema:"changes"`
}{ }{
// This is where you can override the golang default value for one of fields // This is where you can override the golang default value for one of fields
} }
@ -190,7 +190,7 @@ func CreateImageFromSrc(w http.ResponseWriter, r *http.Request) {
return return
} }
// fromSrc – Source to import. The value may be a URL from which the image can be retrieved or - to read the image from the request body. This parameter may only be used when importing an image. // fromSrc – Source to import. The value may be a URL from which the image can be retrieved or - to read the image from the request body. This parameter may only be used when importing an image.
source := query.fromSrc source := query.FromSrc
if source == "-" { if source == "-" {
f, err := ioutil.TempFile("", "api_load.tar") f, err := ioutil.TempFile("", "api_load.tar")
if err != nil { if err != nil {
@ -202,7 +202,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")) 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 { if err != nil {
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "unable to import tarball")) utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "unable to import tarball"))
return return
@ -238,8 +238,8 @@ func CreateImageFromImage(w http.ResponseWriter, r *http.Request) {
runtime := r.Context().Value("runtime").(*libpod.Runtime) runtime := r.Context().Value("runtime").(*libpod.Runtime)
query := struct { query := struct {
fromImage string FromImage string `schema:"fromImage"`
tag string Tag string `schema:"tag"`
}{ }{
// This is where you can override the golang default value for one of fields // This is where you can override the golang default value for one of fields
} }
@ -254,9 +254,9 @@ func CreateImageFromImage(w http.ResponseWriter, r *http.Request) {
repo – Repository name given to an image when it is imported. The repo may include a tag. This parameter may only be used when importing an image. repo – Repository name given to an image when it is imported. The repo may include a tag. This parameter may only be used when importing an image.
tag – Tag or digest. If empty when pulling an image, this causes all tags for the given image to be pulled. tag – Tag or digest. If empty when pulling an image, this causes all tags for the given image to be pulled.
*/ */
fromImage := query.fromImage fromImage := query.FromImage
if len(query.tag) < 1 { if len(query.Tag) < 1 {
fromImage = fmt.Sprintf("%s:%s", fromImage, query.tag) fromImage = fmt.Sprintf("%s:%s", fromImage, query.Tag)
} }
// TODO // TODO