mirror of
				https://github.com/containers/podman.git
				synced 2025-10-31 10:00:01 +08:00 
			
		
		
		
	vendor in latest containers/(storage,common,image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
		
							
								
								
									
										6
									
								
								vendor/github.com/containers/common/pkg/config/default.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								vendor/github.com/containers/common/pkg/config/default.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -122,6 +122,8 @@ const ( | ||||
| 	CgroupfsCgroupsManager = "cgroupfs" | ||||
| 	// DefaultApparmorProfile  specifies the default apparmor profile for the container. | ||||
| 	DefaultApparmorProfile = apparmor.Profile | ||||
| 	// DefaultHostsFile is the default path to the hosts file | ||||
| 	DefaultHostsFile = "/etc/hosts" | ||||
| 	// SystemdCgroupsManager represents systemd native cgroup manager | ||||
| 	SystemdCgroupsManager = "systemd" | ||||
| 	// DefaultLogSizeMax is the default value for the maximum log size | ||||
| @ -189,6 +191,7 @@ func DefaultConfig() (*Config, error) { | ||||
| 			Volumes:             []string{}, | ||||
| 			Annotations:         []string{}, | ||||
| 			ApparmorProfile:     DefaultApparmorProfile, | ||||
| 			BaseHostsFile:       "", | ||||
| 			CgroupNS:            cgroupNS, | ||||
| 			Cgroups:             "enabled", | ||||
| 			DefaultCapabilities: DefaultCapabilities, | ||||
| @ -299,9 +302,6 @@ func defaultConfigFromMemory() (*EngineConfig, error) { | ||||
| 	c.ServiceTimeout = uint(5) | ||||
| 	c.StopTimeout = uint(10) | ||||
| 	c.ExitCommandDelay = uint(5 * 60) | ||||
| 	c.NetworkCmdOptions = []string{ | ||||
| 		"enable_ipv6=true", | ||||
| 	} | ||||
| 	c.Remote = isRemote() | ||||
| 	c.OCIRuntimes = map[string][]string{ | ||||
| 		"crun": { | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Daniel J Walsh
					Daniel J Walsh