Fix e2e binaries path and cli vendor override

- Update docker/cli is now pointing to ulyssessouza/cli.
The change needs the merge of docker/cli#1710
and docker/cli#1690
- Fix issues relative paths in Jenkinsfile and Jenkinsfile.baguette
- Avoid using '--config' in favor of env variable 'DOCKER_CONFIG'

Signed-off-by: Ulysses Souza <[email protected]>

Author: Ulysses Souza

Dockerfile

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

Gopkg.lock

@@ -27,6 +27,11 @@ required = ["github.com/wadey/gocovmerge"]
   name = "github.com/opencontainers/runc"
   version = "v1.0.0-rc6"
 
+#[[override]]
+#  name = "github.com/docker/cli"
+#  revision = "3ddb3133f5b5a74dd4e3f721ced21f4d0b9651b6"
+
+### Waiting on PR https://github.com/docker/cli/pull/1710 to land on cli ###
 [[override]]
   name = "github.com/docker/cnab-to-oci"
   branch = "master"
@@ -38,7 +43,8 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/docker/cli"
-  revision = "3ddb3133f5b5a74dd4e3f721ced21f4d0b9651b6"
+  source = "https://github.com/ulyssessouza/cli"
+  revision="29d30ec1a05e8a285007240cc0f85864067e7344"
 
 [[override]]
   name = "github.com/deislabs/duffle"

Gopkg.toml

@@ -79,6 +79,8 @@ pipeline {
             parallel {
                 stage("Unit Coverage") {
                     environment {
+                        DOCKERAPP_BINARY = '../e2e/coverage-bin'
+                        DOCKERCLI_BINARY = '../docker-linux'
                         CODECOV_TOKEN = credentials('jenkins-codecov-token')
                     }
                     agent {

Jenkinsfile.baguette

@@ -89,7 +89,7 @@ description: my cool app
 # List of application maintainers with name and email for each
 maintainers:
   - name: bob
-    email:
+    email: 
   - name: joe
     email: [email protected]
 `
@@ -103,7 +103,7 @@ maintainers:
 	testAppName := "app-test"
 	dirName := internal.DirNameFromAppName(testAppName)
 
-	cmd := icmd.Cmd{Dir: tmpDir.Path()}
+	cmd := icmd.Cmd{Dir: tmpDir.Path(), Env: os.Environ()}
 
 	cmd.Command = dockerCli.Command("app",
 		"init", testAppName,
@@ -214,7 +214,7 @@ func TestBundle(t *testing.T) {
 	tmpDir := fs.NewDir(t, t.Name())
 	defer tmpDir.Remove()
 	// Using a custom DOCKER_CONFIG to store contexts in a temporary directory
-	cmd := icmd.Cmd{Env: append(os.Environ(), "DOCKER_CONFIG="+tmpDir.Path())}
+	cmd := icmd.Cmd{Env: os.Environ()}
 
 	// Running a docker in docker to bundle the application
 	dind := NewContainer("docker:18.09-dind", 2375)
@@ -271,7 +271,6 @@ func TestDockerAppLifecycle(t *testing.T) {
 	cmd := icmd.Cmd{
 		Env: append(os.Environ(),
 			fmt.Sprintf("DUFFLE_HOME=%s", tmpDir.Path()),
-			fmt.Sprintf("DOCKER_CONFIG=%s", tmpDir.Path()),
 			"DOCKER_TARGET_CONTEXT=swarm-target-context",
 		),
 	}

e2e/commands_test.go

@@ -3,7 +3,7 @@
 # This script is a proxy that injects the required test flags and strips out test output
 # It allows us to use a coverage-enabled binary for e2e tests
 
-BUILD_DIR=${BASH_SOURCE%/*}/../_build
+BUILD_DIR=${GOPATH}/src/github.com/docker/app/_build
 
 $BUILD_DIR/docker-app.cov \
     -test.coverprofile=$BUILD_DIR/cov/$(uuidgen).out \

e2e/coverage-bin

@@ -2,14 +2,17 @@ package e2e
 
 import (
 	"bytes"
+	"encoding/json"
 	"flag"
-	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
+
+	dockerConfigFile "github.com/docker/cli/cli/config/configfile"
 )
 
 var (
@@ -20,17 +23,13 @@ var (
 	dockerCli       dockerCliCommand
 )
 
-const config = `{
-		"cliPluginsExtraDirs": ["%s"]
-}`
-
 type dockerCliCommand struct {
 	path   string
 	config string
 }
 
 func (d dockerCliCommand) Command(args ...string) []string {
-	return append([]string{d.path, "--config", d.config}, args...)
+	return append([]string{d.path}, args...)
 }
 
 func TestMain(m *testing.M) {
@@ -55,22 +54,45 @@ func TestMain(m *testing.M) {
 	// - Create a symbolic link with the dockerApp binary to the plugin directory
 	if dockerCliPath == "" {
 		dockerCliPath = "docker"
+	} else {
+		dockerCliPath, err = filepath.Abs(dockerCliPath)
+		if err != nil {
+			panic(err)
+		}
 	}
 	configDir, err := ioutil.TempDir("", "config")
 	if err != nil {
 		panic(err.Error())
 	}
 	defer os.RemoveAll(configDir)
+
+	err = os.Setenv("DOCKER_CONFIG", configDir)
+	if err != nil {
+		panic(err.Error())
+	}
 	dockerCli = dockerCliCommand{path: dockerCliPath, config: configDir}
-	ioutil.WriteFile(filepath.Join(configDir, "config.json"), []byte(fmt.Sprintf(config, configDir)), 0644)
-	if err := os.Symlink(dockerApp, filepath.Join(configDir, "docker-app")); err != nil {
+
+	config := dockerConfigFile.ConfigFile{CLIPluginsExtraDirs: []string{configDir}}
+	configFile, err := os.Create(filepath.Join(configDir, "config.json"))
+	if err != nil {
+		panic(err.Error())
+	}
+	err = json.NewEncoder(configFile).Encode(config)
+	if err != nil {
+		panic(err.Error())
+	}
+	dockerAppExecName := "docker-app"
+	if runtime.GOOS == "windows" {
+		dockerAppExecName += ".exe"
+	}
+	if err := os.Symlink(dockerApp, filepath.Join(configDir, dockerAppExecName)); err != nil {
 		panic(err.Error())
 	}
 
 	cmd := exec.Command(dockerApp, "app", "version")
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		panic(err)
+		panic(err.Error())
 	}
 	hasExperimental = bytes.Contains(output, []byte("Experimental: on"))
 	i := strings.Index(string(output), "Renderers")