feat #383 (#416)

* feat #383 * fix linting
tensorchord · Jun 17, 2022 · 8a1bd1e · 8a1bd1e
1 parent ffa274c
commit 8a1bd1e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/pkg/app/build.go b/pkg/app/build.go
@@ -99,8 +99,8 @@ func build(clicontext *cli.Context) error {
 		flag.FlagBuildkitdContainer: viper.GetString(flag.FlagBuildkitdContainer),
 	})
 	logger.Debug("starting build command")
-
-	builder, err := builder.New(clicontext.Context, config, manifest, buildContext, tag, clicontext.Path("output"))
+	debug := clicontext.Bool("debug")
+	builder, err := builder.New(clicontext.Context, config, manifest, buildContext, tag, clicontext.Path("output"), debug)
 	if err != nil {
 		return errors.Wrap(err, "failed to create the builder")
 	}

diff --git a/pkg/app/up.go b/pkg/app/up.go
@@ -134,8 +134,8 @@ func up(clicontext *cli.Context) error {
 		flag.FlagBuildkitdContainer: viper.GetString(flag.FlagBuildkitdContainer),
 	})
 	logger.Debug("starting up command")
-
-	builder, err := builder.New(clicontext.Context, config, manifest, buildContext, tag, "")
+	debug := clicontext.Bool("debug")
+	builder, err := builder.New(clicontext.Context, config, manifest, buildContext, tag, "", debug)
 	if err != nil {
 		return errors.Wrap(err, "failed to create the builder")
 	}

diff --git a/pkg/builder/builder.go b/pkg/builder/builder.go
@@ -56,11 +56,15 @@ type generalBuilder struct {
 	buildkitd.Client
 }
 
-func New(ctx context.Context, configFilePath, manifestFilePath, buildContextDir, tag, output string) (Builder, error) {
+func New(ctx context.Context, configFilePath, manifestFilePath, buildContextDir, tag, output string, debug bool) (Builder, error) {
 	outputType, outputDest, err := parseOutput(output)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to parse output")
 	}
+	var mode string = "auto"
+	if debug {
+		mode = "plain"
+	}
 
 	b := &generalBuilder{
 		manifestFilePath: manifestFilePath,
@@ -69,7 +73,7 @@ func New(ctx context.Context, configFilePath, manifestFilePath, buildContextDir,
 		outputDest:       outputDest,
 		buildContextDir:  buildContextDir,
 		// TODO(gaocegege): Support other mode?
-		progressMode: "auto",
+		progressMode: mode,
 		tag:          tag,
 		logger: logrus.WithFields(logrus.Fields{
 			"tag": tag,

diff --git a/pkg/builder/builder_test.go b/pkg/builder/builder_test.go
@@ -56,7 +56,7 @@ var _ = Describe("Builder", func() {
 			buildkitdSocket = "wrong"
 			viper.Set(flag.FlagBuildkitdContainer, buildkitdSocket)
 			It("should return an error", func() {
-				_, err := New(context.TODO(), configFilePath, manifestFilePath, buildContext, tag, "")
+				_, err := New(context.TODO(), configFilePath, manifestFilePath, buildContext, tag, "", false)
 				Expect(err).To(HaveOccurred())
 			})
 		})