Remove --output option

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

e2e/build_test.go

@@ -4,12 +4,11 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"path"
+	"strings"
 	"testing"
 
 	"github.com/deislabs/cnab-go/bundle"
 	"gotest.tools/assert"
-	"gotest.tools/fs"
-
 	"gotest.tools/icmd"
 )
 
@@ -18,12 +17,20 @@ func TestBuild(t *testing.T) {
 		cmd := info.configuredCmd
 
 		testDir := path.Join("testdata", "build")
-		dir := fs.NewDir(t, "test-name")
-		defer dir.Remove()
-		f := dir.Join("bundle.json")
-		cmd.Command = dockerCli.Command("app", "build", path.Join(testDir, "single"), "a-simple-tag", "--output", f)
+		cmd.Command = dockerCli.Command("app", "build", path.Join(testDir, "single"), "single:1.0.0")
 		icmd.RunCmd(cmd).Assert(t, icmd.Success)
 
+		var cfg string
+		for _, s := range cmd.Env {
+			if strings.HasPrefix(s, "DOCKER_CONFIG=") {
+				cfg = s[14:]
+			}
+		}
+		if cfg == "" {
+			t.Fatalf("Failed to retrieve docker config folder")
+		}
+
+		f := path.Join(cfg, "app", "bundles", "docker.io", "library", "single", "_tags", "1.0.0.json")
 		data, err := ioutil.ReadFile(f)
 		assert.NilError(t, err)
 		var bndl bundle.Bundle

internal/commands/build/build.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"strings"
@@ -35,7 +34,6 @@ type buildOptions struct {
 	progress string
 	pull     bool
 	tag      string
-	out      string
 }
 
 func Cmd(dockerCli command.Cli) *cobra.Command {
@@ -60,10 +58,6 @@ func Cmd(dockerCli command.Cli) *cobra.Command {
 	flags.StringVar(&opts.progress, "progress", "auto", "Set type of progress output (auto, plain, tty). Use plain to show container output")
 	flags.BoolVar(&opts.pull, "pull", false, "Always attempt to pull a newer version of the image")
 
-	// For diagnostic and testing only
-	flags.StringVarP(&opts.out, "output", "o", "", "Dump generated bundle into a file")
-	flags.MarkHidden("output") //nolint:errcheck
-
 	return cmd
 }
 
@@ -136,7 +130,7 @@ func runBuild(dockerCli command.Cli, application string, opt buildOptions) (refe
 		}
 	}
 
-	if err = persistBundle(opt, bundle, ref); err != nil {
+	if err = packager.PersistInBundleStore(ref, bundle); err != nil {
 		return nil, err
 	}
 	return ref, nil
@@ -174,21 +168,6 @@ func updateBundle(bundle *bundle.Bundle, resp map[string]*client.SolveResponse)
 	debugBundle(bundle)
 }
 
-func persistBundle(opt buildOptions, bndl *bundle.Bundle, ref reference.Named) error {
-	if opt.out != "" {
-		b, err := json.MarshalIndent(bndl, "", "  ")
-		if err != nil {
-			return err
-		}
-		if opt.out == "-" {
-			_, err = os.Stdout.Write(b)
-			return err
-		}
-		return ioutil.WriteFile(opt.out, b, 0644)
-	}
-	return packager.PersistInBundleStore(ref, bndl)
-}
-
 func createInvocationImageBuildOptions(dockerCli command.Cli, app *types.App) (build.Options, error) {
 	buildContext := bytes.NewBuffer(nil)
 	if err := packager.PackInvocationImageContext(dockerCli, app, buildContext); err != nil {

internal/version.go

@@ -9,7 +9,7 @@ import (
 
 var (
 	// Version is the git tag that this was built from.
-	Version = "v0.8.0-169-gbcdf883109"
+	Version = "unknown"
 	// GitCommit is the commit that this was built from.
 	GitCommit = "unknown"
 	// BuildTime is the time at which the binary was built.