summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-20 07:33:13 -0400
committerGitHub <noreply@github.com>2020-10-20 07:33:13 -0400
commit35b4cb196545eee3b072083e716ad4588e0bb486 (patch)
treea54c09fcfa6e214724e5816eef7984ba4309b8a2 /pkg
parentcec0e5749745f8773d69db3d75395a0c2390bce9 (diff)
parentbacdbf6e205e85a09741f392023b806d2ce41508 (diff)
downloadpodman-35b4cb196545eee3b072083e716ad4588e0bb486.tar.gz
podman-35b4cb196545eee3b072083e716ad4588e0bb486.tar.bz2
podman-35b4cb196545eee3b072083e716ad4588e0bb486.zip
Merge pull request #8069 from matejvasek/fix-memswap
fix: neutral value for MemorySwappiness
Diffstat (limited to 'pkg')
-rw-r--r--pkg/api/handlers/compat/containers_create.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go
index 4ce31cc83..8a0b3c922 100644
--- a/pkg/api/handlers/compat/containers_create.go
+++ b/pkg/api/handlers/compat/containers_create.go
@@ -238,7 +238,7 @@ func makeCreateConfig(ctx context.Context, containerConfig *config.Config, input
Pod: "", // podman
PodmanPath: "", // podman
Quiet: false, // front-end only
- Resources: createconfig.CreateResourceConfig{},
+ Resources: createconfig.CreateResourceConfig{MemorySwappiness: -1},
RestartPolicy: input.HostConfig.RestartPolicy.Name,
Rm: input.HostConfig.AutoRemove,
StopSignal: stopSignal,