darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #946 from hkjn/allow-empty-email

Browse source 
If email is unspecified, pass in -e ' ' to avoid having registry URL interpreted as email, which will fail cryptically.
This commit is contained in:
Brad Rydzewski 2015-04-02 10:08:48 -07:00
commit 50114f573c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugin/publish/docker.go
View file

@ -94,8 +94,14 @@ func (d *Docker) Write(f *buildfile.Buildfile) {
// Login? // Login?
if d.RegistryLogin == true { if d.RegistryLogin == true {
// If email is unspecified, pass in -e ' ' to avoid having
// registry URL interpreted as email, which will fail cryptically.
emailOpt := "' '"
if d.Email != "" {
emailOpt = d.Email
}
f.WriteCmdSilent(fmt.Sprintf("docker login -u %s -p %s -e %s %s", f.WriteCmdSilent(fmt.Sprintf("docker login -u %s -p %s -e %s %s",
d.Username, d.Password, d.Email, d.RegistryLoginUrl)) d.Username, d.Password, emailOpt, d.RegistryLoginUrl))
} }
// Tag and push all tags // Tag and push all tags