diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-17 09:39:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-17 09:39:19 +0000 |
| commit | a9131050cfca0844aabae505a3df6d43426a9fed (patch) | |
| tree | b7306b2f742a6ef2bd2efa31db11e5705a4957e1 /pkg/api | |
| parent | fd0142d8ee78ac2fce6157f9e72b20c007b585ce (diff) | |
| parent | 7e7a79b075f7d65657d95169f02c2c1c03198b93 (diff) | |
| download | podman-a9131050cfca0844aabae505a3df6d43426a9fed.tar.gz podman-a9131050cfca0844aabae505a3df6d43426a9fed.tar.bz2 podman-a9131050cfca0844aabae505a3df6d43426a9fed.zip | |
Merge pull request #15350 from nalind/manifest-amend
podman manifest create: accept --amend and --insecure flags
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/libpod/manifests.go | 3 | ||||
| -rw-r--r-- | pkg/api/server/register_manifest.go | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkg/api/handlers/libpod/manifests.go b/pkg/api/handlers/libpod/manifests.go index b0c93f3b9..fa83bbfe1 100644 --- a/pkg/api/handlers/libpod/manifests.go +++ b/pkg/api/handlers/libpod/manifests.go @@ -36,6 +36,7 @@ func ManifestCreate(w http.ResponseWriter, r *http.Request) { Name string `schema:"name"` Images []string `schema:"images"` All bool `schema:"all"` + Amend bool `schema:"amend"` }{ // Add defaults here once needed. } @@ -70,7 +71,7 @@ func ManifestCreate(w http.ResponseWriter, r *http.Request) { imageEngine := abi.ImageEngine{Libpod: runtime} - createOptions := entities.ManifestCreateOptions{All: query.All} + createOptions := entities.ManifestCreateOptions{All: query.All, Amend: query.Amend} manID, err := imageEngine.ManifestCreate(r.Context(), query.Name, query.Images, createOptions) if err != nil { utils.InternalServerError(w, err) diff --git a/pkg/api/server/register_manifest.go b/pkg/api/server/register_manifest.go index c22479cf9..7a55eaefe 100644 --- a/pkg/api/server/register_manifest.go +++ b/pkg/api/server/register_manifest.go @@ -117,6 +117,10 @@ func (s *APIServer) registerManifestHandlers(r *mux.Router) error { // name: all // type: boolean // description: add all contents if given list + // - in: query + // name: amend + // type: boolean + // description: modify an existing list if one with the desired name already exists // - in: body // name: options // description: options for new manifest |