lint
This commit is contained in:
parent
d85ae1c6a7
commit
06513ea73e
|
@ -296,7 +296,7 @@ properties:
|
|||
|
||||
- name: registries
|
||||
description: |
|
||||
Credentials for registries. Ignored if password was set.
|
||||
Credentials for registries.
|
||||
Example:
|
||||
|
||||
```yaml
|
||||
|
|
|
@ -45,7 +45,7 @@ type RegistryData struct {
|
|||
}
|
||||
|
||||
type RegistriesYaml struct {
|
||||
Registries []RegistryData
|
||||
Registries []RegistryData `yaml:"registries"`
|
||||
}
|
||||
|
||||
// Build defines Docker build parameters.
|
||||
|
@ -186,8 +186,8 @@ func (p *Plugin) Execute() error {
|
|||
}
|
||||
|
||||
if p.settings.Login.RegistriesYaml != "" {
|
||||
if p.settings.Login.Password == "" {
|
||||
var t RegistriesYaml
|
||||
|
||||
err := yaml.Unmarshal([]byte(p.settings.Login.RegistriesYaml), &t)
|
||||
if err != nil {
|
||||
return fmt.Errorf("error unmarshal registries: %w", err)
|
||||
|
@ -199,14 +199,12 @@ func (p *Plugin) Execute() error {
|
|||
}
|
||||
|
||||
cmd := commandLogin(registryData)
|
||||
|
||||
err := cmd.Run()
|
||||
if err != nil {
|
||||
return fmt.Errorf("error authenticating: %w", err)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
logrus.Warn("Cannot use password and registries at same time!")
|
||||
}
|
||||
}
|
||||
|
||||
if p.settings.Daemon.BuildkitConfig != "" {
|
||||
|
|
Loading…
Reference in New Issue