diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-27 12:02:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 12:02:31 -0400 |
| commit | ba9c1f3f17a4f0086d9ac25fe0f211b3c75e514a (patch) | |
| tree | 2ebe0ae37886d1e49b1f2cf7ccfc22d5a911db82 | |
| parent | abda7961d63b1d240f72022757e6be1673e43897 (diff) | |
| parent | 825c84efe1feaf95e63476db6b9c69510e1b87de (diff) | |
| download | podman-ba9c1f3f17a4f0086d9ac25fe0f211b3c75e514a.tar.gz podman-ba9c1f3f17a4f0086d9ac25fe0f211b3c75e514a.tar.bz2 podman-ba9c1f3f17a4f0086d9ac25fe0f211b3c75e514a.zip | |
Merge pull request #10149 from rhatdan/volume
Allow docker volume create API to pass without name
| -rw-r--r-- | pkg/api/handlers/compat/volumes.go | 16 | ||||
| -rw-r--r-- | test/apiv2/30-volumes.at | 7 |
2 files changed, 18 insertions, 5 deletions
diff --git a/pkg/api/handlers/compat/volumes.go b/pkg/api/handlers/compat/volumes.go index d86fc1e19..1ff1468e7 100644 --- a/pkg/api/handlers/compat/volumes.go +++ b/pkg/api/handlers/compat/volumes.go @@ -96,11 +96,17 @@ func CreateVolume(w http.ResponseWriter, r *http.Request) { return } - // See if the volume exists already - existingVolume, err := runtime.GetVolume(input.Name) - if err != nil && errors.Cause(err) != define.ErrNoSuchVolume { - utils.InternalServerError(w, err) - return + var ( + existingVolume *libpod.Volume + err error + ) + if len(input.Name) != 0 { + // See if the volume exists already + existingVolume, err = runtime.GetVolume(input.Name) + if err != nil && errors.Cause(err) != define.ErrNoSuchVolume { + utils.InternalServerError(w, err) + return + } } // if using the compat layer and the volume already exists, we diff --git a/test/apiv2/30-volumes.at b/test/apiv2/30-volumes.at index 623e691e3..ed606134a 100644 --- a/test/apiv2/30-volumes.at +++ b/test/apiv2/30-volumes.at @@ -13,6 +13,13 @@ t POST libpod/volumes/create name=foo1 201 \ .CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \ .Labels={} \ .Options={} +t POST volumes/create 201 \ + .Name~[0-9a-f]\\{64\\} + .Driver=local \ + .Mountpoint=$volumepath/~[0-9a-f]\\{64\\}/_data \ + .CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \ + .Labels={} \ + .Options={} t POST libpod/volumes/create 201 t POST libpod/volumes/create \ Name=foo2 \ |