Merge pull request #7346 from rhatdan/systemd

Don't limit the size on /run for systemd based containers
This commit is contained in:
OpenShift Merge Robot
2020-08-19 21:43:00 +02:00
committed by GitHub
2 changed files with 2 additions and 8 deletions

View File

@ -88,17 +88,11 @@ func parseVolumes(volumeFlag, mountFlag, tmpfsFlag []string, addReadOnlyTmpfs bo
if _, ok := unifiedVolumes[dest]; ok {
continue
}
localOpts := options
if dest == "/run" {
localOpts = append(localOpts, "noexec", "size=65536k")
} else {
localOpts = append(localOpts, "exec")
}
unifiedMounts[dest] = spec.Mount{
Destination: dest,
Type: TypeTmpfs,
Source: "tmpfs",
Options: localOpts,
Options: options,
}
}
}

View File

@ -571,7 +571,7 @@ func (c *Container) setupSystemd(mounts []spec.Mount, g generate.Generator) erro
Destination: dest,
Type: "tmpfs",
Source: "tmpfs",
Options: append(options, "tmpcopyup", "size=65536k"),
Options: append(options, "tmpcopyup"),
}
g.AddMount(tmpfsMnt)
}