containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8624 from mlegenovic/master 

Docker compat API - containers create ignores the name
This commit is contained in:
OpenShift Merge Robot 2020-12-07 10:40:40 -05:00 committed by GitHub
parent dc5da90523 4a2498ff36
commit e6f80fa61a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/handlers/compat/containers_create.go
View File

@ -37,6 +37,9 @@ func CreateContainer(w http.ResponseWriter, r *http.Request) {
return return
} }
// Override the container name in the body struct
body.Name = query.Name
if len(body.HostConfig.Links) > 0 { if len(body.HostConfig.Links) > 0 {
utils.Error(w, utils.ErrLinkNotSupport.Error(), http.StatusBadRequest, errors.Wrapf(utils.ErrLinkNotSupport, "bad parameter")) utils.Error(w, utils.ErrLinkNotSupport.Error(), http.StatusBadRequest, errors.Wrapf(utils.ErrLinkNotSupport, "bad parameter"))
return return
@ -69,9 +72,6 @@ func CreateContainer(w http.ResponseWriter, r *http.Request) {
return return
} }
// Override the container name in the body struct
body.Name = query.Name
ic := abi.ContainerEngine{Libpod: runtime} ic := abi.ContainerEngine{Libpod: runtime}
report, err := ic.ContainerCreate(r.Context(), sg) report, err := ic.ContainerCreate(r.Context(), sg)
if err != nil { if err != nil {

2
test/apiv2/rest_api/test_rest_v2_0_0.py
View File

@ -181,7 +181,7 @@ class TestApi(unittest.TestCase):
self.assertEqual(net_default.status_code, 201, net_default.text) self.assertEqual(net_default.status_code, 201, net_default.text)
create = requests.post( create = requests.post(
PODMAN_URL + "/v1.40/containers/create?name=postCreate", PODMAN_URL + "/v1.40/containers/create?name=postCreateConnect",
json={ json={
"Cmd": ["top"], "Cmd": ["top"],
"Image": "alpine:latest", "Image": "alpine:latest",