github/wp-docker-buildx
0
0
Fork 0
mirror of https://github.com/thegeeklab/wp-docker-buildx.git synced 2024-11-22 10:10:39 +00:00
Code Issues Releases Activity

Merge pull request #61 from vespakoen/more-logging

Browse Source 
More logging, disable docker login email, changes to makefile
This commit is contained in:
Brad Rydzewski 2016-06-18 14:47:08 -07:00 committed by GitHub
commit 82104c20c8
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
.PHONY: all clean deps fmt vet test docker .PHONY: all clean deps fmt vet test docker
EXECUTABLE ?= drone-docker EXECUTABLE ?= drone-docker
IMAGE ?= plugins/$(EXECUTABLE) IMAGE ?= plugins/docker
COMMIT ?= $(shell git rev-parse --short HEAD) COMMIT ?= $(shell git rev-parse --short HEAD)
LDFLAGS = -X "main.buildCommit=$(COMMIT)" LDFLAGS = -X "main.buildCommit=$(COMMIT)"

12
plugin.go
View File

@ -123,6 +123,18 @@ const dockerExe = "/usr/local/bin/docker"
// helper function to create the docker login command. // helper function to create the docker login command.
func commandLogin(login Login) *exec.Cmd { func commandLogin(login Login) *exec.Cmd {
if login.Email != "" {
return commandLoginEmail(login)
}
return exec.Command(
dockerExe, "login",
"-u", login.Username,
"-p", login.Password,
login.Registry,
)
}
func commandLoginEmail(login Login) *exec.Cmd {
return exec.Command( return exec.Command(
dockerExe, "login", dockerExe, "login",
"-u", login.Username, "-u", login.Username,