aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilivoje Legenovic <m.legenovic@gmail.com>2020-12-07 12:50:10 +0100
committerMatthew Heon <mheon@redhat.com>2020-12-07 14:37:01 -0500
commit9b4266eb942b10926ea69ba13d84d5e36a61bd3c (patch)
treef65c90a46315f4e41cb675b13cb399d1304dddbe
parent4fa94d7e14bcfb41b4a73093f0b08a51469b2c45 (diff)
downloadpodman-9b4266eb942b10926ea69ba13d84d5e36a61bd3c.tar.gz
podman-9b4266eb942b10926ea69ba13d84d5e36a61bd3c.tar.bz2
podman-9b4266eb942b10926ea69ba13d84d5e36a61bd3c.zip
Docker compat API - containers create ignores the name
/containers/create compat endpoint does not set the name correctly (#7857) Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
-rw-r--r--pkg/api/handlers/compat/containers_create.go6
-rw-r--r--test/apiv2/rest_api/test_rest_v2_0_0.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go
index 729639928..409a74de2 100644
--- a/pkg/api/handlers/compat/containers_create.go
+++ b/pkg/api/handlers/compat/containers_create.go
@@ -37,6 +37,9 @@ func CreateContainer(w http.ResponseWriter, r *http.Request) {
return
}
+ // Override the container name in the body struct
+ body.Name = query.Name
+
if len(body.HostConfig.Links) > 0 {
utils.Error(w, utils.ErrLinkNotSupport.Error(), http.StatusBadRequest, errors.Wrapf(utils.ErrLinkNotSupport, "bad parameter"))
return
@@ -69,9 +72,6 @@ func CreateContainer(w http.ResponseWriter, r *http.Request) {
return
}
- // Override the container name in the body struct
- body.Name = query.Name
-
ic := abi.ContainerEngine{Libpod: runtime}
report, err := ic.ContainerCreate(r.Context(), sg)
if err != nil {
diff --git a/test/apiv2/rest_api/test_rest_v2_0_0.py b/test/apiv2/rest_api/test_rest_v2_0_0.py
index 52348d4f4..abb820053 100644
--- a/test/apiv2/rest_api/test_rest_v2_0_0.py
+++ b/test/apiv2/rest_api/test_rest_v2_0_0.py
@@ -172,7 +172,7 @@ class TestApi(unittest.TestCase):
self.assertEqual(net_default.status_code, 201, net_default.text)
create = requests.post(
- PODMAN_URL + "/v1.40/containers/create?name=postCreate",
+ PODMAN_URL + "/v1.40/containers/create?name=postCreateConnect",
json={
"Cmd": ["top"],
"Image": "alpine:latest",