1berry/docker-compose
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't warn about uid/gid not being supported while ... they are

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2024-10-24 15:11:03 +02:00 committed by Nicolas De loof
parent 5617eff0c2
commit a4ee6ca7a5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/compose/create.go
View File

@ -977,10 +977,6 @@ func buildContainerConfigMounts(p types.Project, s types.ServiceConfig) ([]mount
target = configsBaseDir + config.Target target = configsBaseDir + config.Target
} }
if config.UID != "" || config.GID != "" || config.Mode != nil {
logrus.Warn("config `uid`, `gid` and `mode` are not supported, they will be ignored")
}
definedConfig := p.Configs[config.Source] definedConfig := p.Configs[config.Source]
if definedConfig.External { if definedConfig.External {
return nil, fmt.Errorf("unsupported external config %s", definedConfig.Name) return nil, fmt.Errorf("unsupported external config %s", definedConfig.Name)
@ -997,6 +993,10 @@ func buildContainerConfigMounts(p types.Project, s types.ServiceConfig) ([]mount
continue continue
} }
if config.UID != "" || config.GID != "" || config.Mode != nil {
logrus.Warn("config `uid`, `gid` and `mode` are not supported, they will be ignored")
}
bindMount, err := buildMount(p, types.ServiceVolumeConfig{ bindMount, err := buildMount(p, types.ServiceVolumeConfig{
Type: types.VolumeTypeBind, Type: types.VolumeTypeBind,
Source: definedConfig.File, Source: definedConfig.File,
@ -1027,10 +1027,6 @@ func buildContainerSecretMounts(p types.Project, s types.ServiceConfig) ([]mount
target = secretsDir + secret.Target target = secretsDir + secret.Target
} }
if secret.UID != "" || secret.GID != "" || secret.Mode != nil {
logrus.Warn("secrets `uid`, `gid` and `mode` are not supported, they will be ignored")
}
definedSecret := p.Secrets[secret.Source] definedSecret := p.Secrets[secret.Source]
if definedSecret.External { if definedSecret.External {
return nil, fmt.Errorf("unsupported external secret %s", definedSecret.Name) return nil, fmt.Errorf("unsupported external secret %s", definedSecret.Name)
@ -1047,6 +1043,10 @@ func buildContainerSecretMounts(p types.Project, s types.ServiceConfig) ([]mount
continue continue
} }
if secret.UID != "" || secret.GID != "" || secret.Mode != nil {
logrus.Warn("secrets `uid`, `gid` and `mode` are not supported, they will be ignored")
}
if _, err := os.Stat(definedSecret.File); os.IsNotExist(err) { if _, err := os.Stat(definedSecret.File); os.IsNotExist(err) {
logrus.Warnf("secret file %s does not exist", definedSecret.Name) logrus.Warnf("secret file %s does not exist", definedSecret.Name)
} }