Merge pull request #491 from simonferquel/move-back-to-cli-master

Bump docker/cli vendoring

Author: silvin-lubecki

Dockerfile

@@ -8,9 +8,7 @@ RUN apt-get install -y -q --no-install-recommends \
 
 WORKDIR /go/src/github.com/docker/cli
 
-RUN git clone https://github.com/chris-crone/cli . && git checkout d6bfd7e5592dad85969516c131d33910fa5ebd58
-# FIXME(ulyssessouza): Go back to the line below when PRs https://github.com/docker/cli/pull/1718 and https://github.com/docker/cli/pull/1690 hits the cli
-#RUN git clone https://github.com/docker/cli.git . && git checkout 8ddde26af67f9a76734a1676c635e48da4fe8584
+RUN git clone https://github.com/docker/cli . && git checkout 80918147ff32b0bf2a424d9133a45bab670793ff
 
 RUN make cross binary && \
  cp build/docker-linux-amd64 /usr/bin/docker

Gopkg.lock

@@ -36,11 +36,9 @@ required = ["github.com/wadey/gocovmerge"]
   source = "github.com/simonferquel/containerd"
   revision = "42c3614d58767e96c1752977fed94d0b140a0173"
 
-### Waiting on PR https://github.com/docker/cli/pull/1718 and https://github.com/docker/cli/pull/1690 to land on cli ###
 [[override]]
   name = "github.com/docker/cli"
-  source = "https://github.com/chris-crone/cli"
-  revision="d6bfd7e5592dad85969516c131d33910fa5ebd58"
+  branch = "master"
 
 [[override]]
   name = "github.com/deislabs/duffle"

Gopkg.toml

@@ -11,7 +11,18 @@ import (
 
 func main() {
 	plugin.Run(func(dockerCli command.Cli) *cobra.Command {
-		return app.NewRootCmd("app", dockerCli)
+		cmd := app.NewRootCmd("app", dockerCli)
+		originalPreRun := cmd.PersistentPreRunE
+		cmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
+			if err := plugin.PersistentPreRunE(cmd, args); err != nil {
+				return err
+			}
+			if originalPreRun != nil {
+				return originalPreRun(cmd, args)
+			}
+			return nil
+		}
+		return cmd
 	}, manager.Metadata{
 		SchemaVersion: "0.1.0",
 		Vendor:        "Docker Inc.",

cmd/docker-app/main.go

@@ -14,7 +14,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-func storeBaseDir() string {
+func storeBaseDir() (string, error) {
 	return config.Path("app-bundle-store")
 }
 func storePath(ref reference.Named) (string, error) {
@@ -29,8 +29,12 @@ func storePath(ref reference.Named) (string, error) {
 	// when parsing the ref) then there will be errors when we try
 	// to use this as a path later.
 	name = strings.Replace(name, ":", "_", 1)
+	baseDir, err := storeBaseDir()
+	if err != nil {
+		return "", err
+	}
 
-	storeDir := filepath.Join(storeBaseDir(), filepath.FromSlash(name))
+	storeDir := filepath.Join(baseDir, filepath.FromSlash(name))
 
 	// We rely here on _ not being valid in a name meaning there can be no clashes due to nesting of repositories.
 	switch t := ref.(type) {

internal/store/store.go

@@ -17,7 +17,8 @@ func parseRefOrDie(t *testing.T, ref string) reference.Named {
 
 func TestStorePath(t *testing.T) {
 	testSha := "2957c6606cc94099f7dfe0011b5c8daf4a605ed6124d4eee773bab1e05a8ce87"
-	basedir := storeBaseDir()
+	basedir, err := storeBaseDir()
+	assert.NilError(t, err)
 	for _, tc := range []struct {
 		Name            string
 		Ref             reference.Named