PapaTutuWawa/woodpecker-docker-buildx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refact(main): readable

Browse Source
This commit is contained in:
Anton Konovalov 2015-10-16 10:37:17 +03:00
parent 9794f92866
commit 0f4ab18017
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
main.go
View File

@ -12,19 +12,19 @@ import (
) )
type Docker struct { type Docker struct {
Storage string `json:"storage_driver"` Storage string `json:"storage_driver"`
Registry string `json:"registry"` Registry string `json:"registry"`
Insecure bool `json:"insecure"` Insecure bool `json:"insecure"`
Username string `json:"username"` Username string `json:"username"`
Password string `json:"password"` Password string `json:"password"`
Email string `json:"email"` Email string `json:"email"`
Auth string `json:"auth"` Auth string `json:"auth"`
Repo string `json:"repo"` Repo string `json:"repo"`
Tag string `json:"tag"` Tag string `json:"tag"`
File string `json:"file"` File string `json:"file"`
// see more here https://docs.docker.com/reference/commandline/build/ // see more here https://docs.docker.com/reference/commandline/build/
Context string `json:"context"` Context string `json:"context"`
Dns []string `json:"dns"` Dns []string `json:"dns"`
} }
func main() { func main() {
@ -48,7 +48,11 @@ func main() {
if len(vargs.Registry) == 0 { if len(vargs.Registry) == 0 {
vargs.Registry = "https://index.docker.io/v1/" vargs.Registry = "https://index.docker.io/v1/"
} }
// Set the Dockerfile path // Set the Dockerfile name
if len(vargs.File) == 0 {
vars.File = "Dockerfile"
}
// Set the Context value
if len(vargs.Context) == 0 { if len(vargs.Context) == 0 {
vargs.Context = "." vargs.Context = "."
} }
@ -123,14 +127,8 @@ func main() {
trace(cmd) trace(cmd)
cmd.Run() 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 // Build the container
cmd = exec.Command(strCmd[0],strCmd[1:]...) cmd = exec.Command("/usr/bin/docker", "build", "--pull=true", "--rm=true", "-f", vars.File, "-t", vargs.Repo, vargs.Context)
cmd.Dir = workspace.Path cmd.Dir = workspace.Path
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr