tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1497 from docker/windows_mount 

don't use filepath to process remote bind paths
This commit is contained in:
Nicolas De loof 2021-04-07 10:19:59 +02:00 committed by GitHub
parent bd5c188be6 dc036c2686
commit 84fcdee8df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
local/compose/create.go
View File

@ -618,9 +618,9 @@ func buildContainerConfigMounts(p types.Project, s types.ServiceConfig) ([]mount
for _, config := range s.Configs {
target := config.Target
if config.Target == "" {
target = filepath.Join(configsBaseDir, config.Source)
} else if !filepath.IsAbs(config.Target) {
target = filepath.Join(configsBaseDir, config.Target)
target = configsBaseDir + config.Source
} else if !isUnixAbs(config.Target) {
target = configsBaseDir + config.Target
}
definedConfig := p.Configs[config.Source]
@ -649,13 +649,13 @@ func buildContainerConfigMounts(p types.Project, s types.ServiceConfig) ([]mount
func buildContainerSecretMounts(p types.Project, s types.ServiceConfig) ([]mount.Mount, error) {
var mounts = map[string]mount.Mount{}
secretsDir := "/run/secrets"
secretsDir := "/run/secrets/"
for _, secret := range s.Secrets {
target := secret.Target
if secret.Target == "" {
target = filepath.Join(secretsDir, secret.Source)
} else if !filepath.IsAbs(secret.Target) {
target = filepath.Join(secretsDir, secret.Target)
target = secretsDir + secret.Source
} else if !isUnixAbs(secret.Target) {
target = secretsDir + secret.Target
}
definedSecret := p.Secrets[secret.Source]
@ -681,6 +681,10 @@ func buildContainerSecretMounts(p types.Project, s types.ServiceConfig) ([]mount
return values, nil
}
func isUnixAbs(path string) bool {
return strings.HasPrefix(path, "/")
}
func buildMount(project types.Project, volume types.ServiceVolumeConfig) (mount.Mount, error) {
source := volume.Source
if volume.Type == types.VolumeTypeBind && !filepath.IsAbs(source) {
@ -699,7 +703,6 @@ func buildMount(project types.Project, volume types.ServiceVolumeConfig) (mount.
source = pVolume.Name
}
}
}
return mount.Mount{