summaryrefslogtreecommitdiff
path: root/pkg/api/handlers/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-11-13 13:12:48 +0100
committerGitHub <noreply@github.com>2021-11-13 13:12:48 +0100
commitcca6df428cb9ce187ae1341740ac1137c7a67a75 (patch)
tree7372a67e90ea951c0ad2f64bc9c3a676f4b54fe1 /pkg/api/handlers/libpod
parent8f3fb743ee57964594b36fdffb7b8fc5e3ca3371 (diff)
parent9226ccb59f5967f5c784280b993711530615dcd7 (diff)
downloadpodman-cca6df428cb9ce187ae1341740ac1137c7a67a75.tar.gz
podman-cca6df428cb9ce187ae1341740ac1137c7a67a75.tar.bz2
podman-cca6df428cb9ce187ae1341740ac1137c7a67a75.zip
Merge pull request #12272 from hshiina/memory-swappiness
Enable 'podman run --memory-swappiness=0'
Diffstat (limited to 'pkg/api/handlers/libpod')
-rw-r--r--pkg/api/handlers/libpod/pods.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
index 2ba292579..3d18406a5 100644
--- a/pkg/api/handlers/libpod/pods.go
+++ b/pkg/api/handlers/libpod/pods.go
@@ -39,8 +39,10 @@ func PodCreate(w http.ResponseWriter, r *http.Request) {
return
}
if !psg.NoInfra {
- infraOptions := &entities.ContainerCreateOptions{ImageVolume: "bind", IsInfra: true, Net: &entities.NetOptions{}, Devices: psg.Devices} // options for pulling the image and FillOutSpec
- err = specgenutil.FillOutSpecGen(psg.InfraContainerSpec, infraOptions, []string{}) // necessary for default values in many cases (userns, idmappings)
+ infraOptions := entities.NewInfraContainerCreateOptions() // options for pulling the image and FillOutSpec
+ infraOptions.Net = &entities.NetOptions{}
+ infraOptions.Devices = psg.Devices
+ err = specgenutil.FillOutSpecGen(psg.InfraContainerSpec, &infraOptions, []string{}) // necessary for default values in many cases (userns, idmappings)
if err != nil {
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "error filling out specgen"))
return