diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-15 09:10:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 09:10:12 -0400 |
| commit | 4b6ffda31c258aadcbc6171a7dd745d0fb17393c (patch) | |
| tree | b05003f91e2f1fd73dd1cd945241d3d7188d2b5f /pkg/api | |
| parent | 4dd7bfdfaa3adf95af39fd45f74d49cea0c80064 (diff) | |
| parent | 84005330aa3d25cf6134fffc1bf20354d4a3dd85 (diff) | |
| download | podman-4b6ffda31c258aadcbc6171a7dd745d0fb17393c.tar.gz podman-4b6ffda31c258aadcbc6171a7dd745d0fb17393c.tar.bz2 podman-4b6ffda31c258aadcbc6171a7dd745d0fb17393c.zip | |
Merge pull request #11409 from cdoern/podVolumes
Pod Volumes Support
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/libpod/pods.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index cc686c69d..1f03e121e 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -52,13 +52,11 @@ func PodCreate(w http.ResponseWriter, r *http.Request) { utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "failed to decode specgen")) return } - tempSpec := &specgen.SpecGenerator{} // temporary spec since infra cannot be decoded into - err = json.Unmarshal(out, tempSpec) // unmarhal matching options + err = json.Unmarshal(out, psg.InfraContainerSpec) // unmarhal matching options if err != nil { utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "failed to decode specgen")) return } - psg.InfraContainerSpec = tempSpec // set infra spec equal to temp // a few extra that do not have the same json tags psg.InfraContainerSpec.Name = psg.InfraName psg.InfraContainerSpec.ConmonPidFile = psg.InfraConmonPidFile |