"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "container/container.go" between
moby-20.10.6.tar.gz and moby-20.10.7.tar.gz

About: Moby is a framework to assemble specialized container systems (formerly project name Docker; see here to clarify the relationship between the projects).

container.go  (moby-20.10.6):container.go  (moby-20.10.7)
skipping to change at line 719 skipping to change at line 719
} }
func getSecretTargetPath(r *swarmtypes.SecretReference) string { func getSecretTargetPath(r *swarmtypes.SecretReference) string {
if filepath.IsAbs(r.File.Name) { if filepath.IsAbs(r.File.Name) {
return r.File.Name return r.File.Name
} }
return filepath.Join(containerSecretMountPath, r.File.Name) return filepath.Join(containerSecretMountPath, r.File.Name)
} }
// getConfigTargetPath makes sure that config paths inside the container are
// absolute, as required by the runtime spec, and enforced by runc >= 1.0.0-rc94
.
// see https://github.com/opencontainers/runc/issues/2928
func getConfigTargetPath(r *swarmtypes.ConfigReference) string {
if filepath.IsAbs(r.File.Name) {
return r.File.Name
}
return filepath.Join(containerConfigMountPath, r.File.Name)
}
// CreateDaemonEnvironment creates a new environment variable slice for this con tainer. // CreateDaemonEnvironment creates a new environment variable slice for this con tainer.
func (container *Container) CreateDaemonEnvironment(tty bool, linkedEnv []string ) []string { func (container *Container) CreateDaemonEnvironment(tty bool, linkedEnv []string ) []string {
// Setup environment // Setup environment
os := container.OS os := container.OS
if os == "" { if os == "" {
os = runtime.GOOS os = runtime.GOOS
} }
// Figure out what size slice we need so we can allocate this all at once . // Figure out what size slice we need so we can allocate this all at once .
envSize := len(container.Config.Env) envSize := len(container.Config.Env)
 End of changes. 1 change blocks. 
0 lines changed or deleted 12 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)