Merge pull request #537 from silvin-lubecki/experimental-plugin

Mark docker app plugin as experimental

Dockerfile

@@ -8,7 +8,7 @@ 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 checkout 2432af701a7973ea582196b4b9488831156f3458
+RUN git clone https://github.com/docker/cli . && git checkout a1b83ffd2cbeefc0752e5aa7a543d49c1ddfd2cb
 
 RUN make binary-osx binary-windows binary && \
  cp build/docker-linux-amd64 /usr/bin/docker

cmd/docker-app/main.go

@@ -27,5 +27,6 @@ func main() {
 		SchemaVersion: "0.1.0",
 		Vendor:        "Docker Inc.",
 		Version:       internal.Version,
+		Experimental:  true,
 	})
 }

e2e/main_test.go

@@ -61,7 +61,9 @@ func (d dockerCliCommand) createTestCmd(ops ...ConfigFileOperator) (icmd.Cmd, fu
 	cleanup := func() {
 		os.RemoveAll(configDir)
 	}
-	env := append(os.Environ(), "DOCKER_CONFIG="+configDir)
+	env := append(os.Environ(),
+		"DOCKER_CONFIG="+configDir,
+		"DOCKER_CLI_EXPERIMENTAL=enabled") // TODO: Remove this once docker app plugin is no more experimental
 	return icmd.Cmd{Env: env}, cleanup
 }