From 9794f928666afe6a50746a809e9123e03c77d182 Mon Sep 17 00:00:00 2001 From: Anton Konovalov Date: Thu, 15 Oct 2015 14:16:09 +0300 Subject: [PATCH] fix(file): fixing work with Dockerfile.* now it's not work becaouse file != context see more here https://docs.docker.com/reference/commandline/build/ --- main.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index 0782478..dc2eff5 100644 --- a/main.go +++ b/main.go @@ -22,7 +22,9 @@ type Docker struct { Repo string `json:"repo"` Tag string `json:"tag"` File string `json:"file"` - Dns []string `json:"dns"` + // see more here https://docs.docker.com/reference/commandline/build/ + Context string `json:"context"` + Dns []string `json:"dns"` } func main() { @@ -47,8 +49,8 @@ func main() { vargs.Registry = "https://index.docker.io/v1/" } // Set the Dockerfile path - if len(vargs.File) == 0 { - vargs.File = "." + if len(vargs.Context) == 0 { + vargs.Context = "." } // Set the Tag value if len(vargs.Tag) == 0 { @@ -121,8 +123,14 @@ func main() { trace(cmd) cmd.Run() + strCmd := []string{"/usr/bin/docker", "build", "--pull=true","--rm=true", "-t", vargs.Repo, vargs.Context} + // Add file flag to cmd + if len(vargs.File) != 0 { + strCmd = append(append(strCmd[0:3],"-f="+vargs.File),strCmd[4:]...) + } + // Build the container - cmd = exec.Command("/usr/bin/docker", "build", "--pull=true", "--rm=true", "-t", vargs.Repo, vargs.File) + cmd = exec.Command(strCmd[0],strCmd[1:]...) cmd.Dir = workspace.Path cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr