From 6e29d1b08738d0bea076441ff0a4c09c0ce187c6 Mon Sep 17 00:00:00 2001 From: Travis McLane Date: Sat, 4 Apr 2020 14:45:03 -0500 Subject: [PATCH] docker process updates - inform user we are starting to pull image and it may take a while - inform user the target platform being built using docker image --- cmd/helpers.go | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/cmd/helpers.go b/cmd/helpers.go index 4930280e..f6197dc8 100644 --- a/cmd/helpers.go +++ b/cmd/helpers.go @@ -100,6 +100,28 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt return err } + var packSpinner *spinner.Spinner + if !projectOptions.Verbose { + packSpinner = spinner.New("Pulling wailsapp/xgo:latest docker image... (may take a while)") + packSpinner.SetSpinSpeed(50) + packSpinner.Start() + } else { + println("Pulling wailsapp/xgo:latest docker image... (may take a while)") + } + + err := NewProgramHelper(projectOptions.Verbose).RunCommandArray([]string{"docker", + "pull", "wailsapp/xgo:latest"}) + + if err != nil { + if packSpinner != nil { + packSpinner.Error() + } + return err + } + if packSpinner != nil { + packSpinner.Success() + } + buildCommand := slicer.String() userid := 1000 user, _ := user.Current() @@ -130,13 +152,14 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt buildCommand.Add(arg) } - compileMessage := "Packing + Compiling project" + compileMessage := fmt.Sprintf( + "Packing + Compiling project for %s/%s using docker image wailsapp/xgo:latest", + projectOptions.Platform, projectOptions.Architecture) if buildMode == BuildModeDebug { compileMessage += " (Debug Mode)" } - var packSpinner *spinner.Spinner if !projectOptions.Verbose { packSpinner = spinner.New(compileMessage + "...") packSpinner.SetSpinSpeed(50) @@ -145,8 +168,7 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt println(compileMessage) } - fmt.Printf("Command Line: %s\n", buildCommand.AsSlice()) - err := NewProgramHelper(projectOptions.Verbose).RunCommandArray(buildCommand.AsSlice()) + err = NewProgramHelper(projectOptions.Verbose).RunCommandArray(buildCommand.AsSlice()) if err != nil { if packSpinner != nil { packSpinner.Error()