opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1605 from mheon/syslog_cleanup

Browse Source 
Pass along syslog variable to podman cleanup processes
This commit is contained in:
OpenShift Merge Robot
2018-10-11 11:49:45 -07:00
committed by GitHub
parent 6d8bc879cb f87f0abb77
commit 5f6e4cc830
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/podman/create.go
View File

@ -782,6 +782,7 @@ func parseCreateOpts(ctx context.Context, c *cli.Context, runtime *libpod.Runtim
WorkDir: workDir,
Rootfs: rootfs,
VolumesFrom: c.StringSlice("volumes-from"),
Syslog: c.GlobalBool("syslog"),
}
if config.Privileged {

10
pkg/spec/createconfig.go
View File

@ -134,6 +134,7 @@ type CreateConfig struct {
SecurityOpts []string
Rootfs string
LocalVolumes []string //Keeps track of the built-in volumes of container used in the --volumes-from flag
Syslog bool // Whether to enable syslog on exit commands
}
func u32Ptr(i int64) *uint32 { u := uint32(i); return &u }
@ -288,8 +289,8 @@ func (c *CreateConfig) GetTmpfsMounts() []spec.Mount {
return m
}
func createExitCommand(runtime *libpod.Runtime) []string {
config := runtime.GetConfig()
func (c *CreateConfig) createExitCommand() []string {
config := c.Runtime.GetConfig()
cmd, _ := os.Executable()
command := []string{cmd,
@ -302,6 +303,9 @@ func createExitCommand(runtime *libpod.Runtime) []string {
if config.StorageConfig.GraphDriverName != "" {
command = append(command, []string{"--storage-driver", config.StorageConfig.GraphDriverName}...)
}
if c.Syslog {
command = append(command, "--syslog")
}
return append(command, []string{"container", "cleanup"}...)
}
@ -481,7 +485,7 @@ func (c *CreateConfig) GetContainerCreateOptions(runtime *libpod.Runtime) ([]lib
options = append(options, libpod.WithCgroupParent(c.CgroupParent))
}
if c.Detach {
options = append(options, libpod.WithExitCommand(createExitCommand(runtime)))
options = append(options, libpod.WithExitCommand(c.createExitCommand()))
}
return options, nil