summaryrefslogtreecommitdiff
path: root/cmd/podman
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 /cmd/podman
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 'cmd/podman')
-rw-r--r--cmd/podman/containers/create.go4
-rw-r--r--cmd/podman/pods/create.go3
2 files changed, 4 insertions, 3 deletions
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go
index d35c1a192..9b53a730f 100644
--- a/cmd/podman/containers/create.go
+++ b/cmd/podman/containers/create.go
@@ -376,7 +376,9 @@ func createPodIfNecessary(s *specgen.SpecGenerator, netOpts *entities.NetOptions
return nil, err
}
- infraOpts := entities.ContainerCreateOptions{ImageVolume: "bind", Net: netOpts, Quiet: true}
+ infraOpts := entities.NewInfraContainerCreateOptions()
+ infraOpts.Net = netOpts
+ infraOpts.Quiet = true
imageName := config.DefaultInfraImage
podGen.InfraImage = imageName
podGen.InfraContainerSpec = specgen.NewSpecGenerator(imageName, false)
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go
index 0d759a586..7399dd029 100644
--- a/cmd/podman/pods/create.go
+++ b/cmd/podman/pods/create.go
@@ -46,7 +46,7 @@ var (
var (
createOptions entities.PodCreateOptions
- infraOptions entities.ContainerCreateOptions
+ infraOptions = entities.NewInfraContainerCreateOptions()
infraImage string
labels, labelFile []string
podIDFile string
@@ -61,7 +61,6 @@ func init() {
})
flags := createCommand.Flags()
flags.SetInterspersed(false)
- infraOptions.IsInfra = true
common.DefineCreateFlags(createCommand, &infraOptions, true)
common.DefineNetFlags(createCommand)