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 #103 from tuxity/dockerd

Browse Source 
Use dockerd instead of docker daemon
This commit is contained in:
Brad Rydzewski 2017-02-01 00:27:06 +07:00 committed by GitHub
commit 0d98008242
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin.go
View File

@ -148,6 +148,7 @@ func (p Plugin) Exec() error {
} }
const dockerExe = "/usr/local/bin/docker" const dockerExe = "/usr/local/bin/docker"
const dockerdExe = "/usr/local/bin/dockerd"
// 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 {
@ -268,7 +269,7 @@ func commandPush(build Build, tag string) *exec.Cmd {
// helper function to create the docker daemon command. // helper function to create the docker daemon command.
func commandDaemon(daemon Daemon) *exec.Cmd { func commandDaemon(daemon Daemon) *exec.Cmd {
args := []string{"daemon", "-g", daemon.StoragePath} args := []string{"-g", daemon.StoragePath}
if daemon.StorageDriver != "" { if daemon.StorageDriver != "" {
args = append(args, "-s", daemon.StorageDriver) args = append(args, "-s", daemon.StorageDriver)
@ -294,7 +295,7 @@ func commandDaemon(daemon Daemon) *exec.Cmd {
if daemon.Experimental { if daemon.Experimental {
args = append(args, "--experimental") args = append(args, "--experimental")
} }
return exec.Command(dockerExe, args...) return exec.Command(dockerdExe, args...)
} }
// trace writes each command to stdout with the command wrapped in an xml // trace writes each command to stdout with the command wrapped in an xml