From a4ee6ca7a53ba09838c8fe974500880a0e7e5a0c Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Thu, 24 Oct 2024 15:11:03 +0200 Subject: [PATCH] don't warn about uid/gid not being supported while ... they are Signed-off-by: Nicolas De Loof --- pkg/compose/create.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/compose/create.go b/pkg/compose/create.go index 6994823ab..3e5590e91 100644 --- a/pkg/compose/create.go +++ b/pkg/compose/create.go @@ -977,10 +977,6 @@ func buildContainerConfigMounts(p types.Project, s types.ServiceConfig) ([]mount 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] if definedConfig.External { return nil, fmt.Errorf("unsupported external config %s", definedConfig.Name) @@ -997,6 +993,10 @@ func buildContainerConfigMounts(p types.Project, s types.ServiceConfig) ([]mount 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{ Type: types.VolumeTypeBind, Source: definedConfig.File, @@ -1027,10 +1027,6 @@ func buildContainerSecretMounts(p types.Project, s types.ServiceConfig) ([]mount 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] if definedSecret.External { return nil, fmt.Errorf("unsupported external secret %s", definedSecret.Name) @@ -1047,6 +1043,10 @@ func buildContainerSecretMounts(p types.Project, s types.ServiceConfig) ([]mount 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) { logrus.Warnf("secret file %s does not exist", definedSecret.Name) }