mirror of
https://github.com/thegeeklab/drone-docker-buildx.git
synced 2024-06-15 14:50:53 +02:00
lint
This commit is contained in:
parent
d85ae1c6a7
commit
06513ea73e
|
@ -296,7 +296,7 @@ properties:
|
||||||
|
|
||||||
- name: registries
|
- name: registries
|
||||||
description: |
|
description: |
|
||||||
Credentials for registries. Ignored if password was set.
|
Credentials for registries.
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
|
|
|
@ -140,7 +140,7 @@ func commandBuild(build Build, dryrun bool) *execabs.Cmd {
|
||||||
args = append(args, "--platform", strings.Join(build.Platforms.Value(), ","))
|
args = append(args, "--platform", strings.Join(build.Platforms.Value(), ","))
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, repo := range build.Repo.Value() {
|
for _, repo := range build.Repo.Value() {
|
||||||
for _, arg := range build.Tags.Value() {
|
for _, arg := range build.Tags.Value() {
|
||||||
args = append(args, "-t", fmt.Sprintf("%s:%s", repo, arg))
|
args = append(args, "-t", fmt.Sprintf("%s:%s", repo, arg))
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,7 @@ type RegistryData struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type RegistriesYaml struct {
|
type RegistriesYaml struct {
|
||||||
Registries []RegistryData
|
Registries []RegistryData `yaml:"registries"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build defines Docker build parameters.
|
// Build defines Docker build parameters.
|
||||||
|
@ -186,26 +186,24 @@ func (p *Plugin) Execute() error {
|
||||||
}
|
}
|
||||||
|
|
||||||
if p.settings.Login.RegistriesYaml != "" {
|
if p.settings.Login.RegistriesYaml != "" {
|
||||||
if p.settings.Login.Password == "" {
|
var t RegistriesYaml
|
||||||
var t RegistriesYaml
|
|
||||||
err := yaml.Unmarshal([]byte(p.settings.Login.RegistriesYaml), &t)
|
err := yaml.Unmarshal([]byte(p.settings.Login.RegistriesYaml), &t)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("error unmarshal registries: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, registryData := range t.Registries {
|
||||||
|
if registryData.Registry == "" {
|
||||||
|
registryData.Registry = "https://index.docker.io/v1/"
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd := commandLogin(registryData)
|
||||||
|
|
||||||
|
err := cmd.Run()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("error unmarshal registries: %w", err)
|
return fmt.Errorf("error authenticating: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, registryData := range t.Registries {
|
|
||||||
if registryData.Registry == "" {
|
|
||||||
registryData.Registry = "https://index.docker.io/v1/"
|
|
||||||
}
|
|
||||||
|
|
||||||
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!")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user