install/uninstall: allow aliasing buildx to docker builder

Dockerfile

@@ -35,7 +35,8 @@ COPY . .
 FROM golang:1.12-alpine AS docker-cli-build
 RUN apk add -U git bash coreutils gcc musl-dev
 ENV CGO_ENABLED=0
-ARG REPO=github.com/docker/cli
+ARG REPO=github.com/tiborvass/cli
+ARG BRANCH=cli-plugin-aliases
 ARG CLI_VERSION
 WORKDIR /go/src/github.com/docker/cli
 RUN git clone git://$REPO . && git checkout $BRANCH
@@ -58,7 +59,7 @@ RUN mkdir -p /usr/local/lib/docker/cli-plugins && ln -s /usr/local/bin/buildx /u
 COPY ./hack/demo-env/entrypoint.sh /usr/local/bin
 COPY ./hack/demo-env/tmux.conf /root/.tmux.conf
 COPY --from=dockerd-release /usr/local/bin /usr/local/bin
-#COPY --from=docker-cli-build /go/src/github.com/docker/cli/build/docker /usr/local/bin
+COPY --from=docker-cli-build /go/src/github.com/docker/cli/build/docker /usr/local/bin
 
 WORKDIR /work
 COPY ./hack/demo-env/examples .

commands/install.go

@@ -0,0 +1,52 @@
+package commands
+
+import (
+	"os"
+
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/config"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+type installOptions struct {
+}
+
+func runInstall(dockerCli command.Cli, in installOptions) error {
+	dir := config.Dir()
+	if err := os.MkdirAll(dir, 0755); err != nil {
+		return errors.Wrap(err, "could not create docker config")
+	}
+
+	cfg, err := config.Load(dir)
+	if err != nil {
+		return err
+	}
+
+	if cfg.Aliases == nil {
+		cfg.Aliases = map[string]string{}
+	}
+	cfg.Aliases["builder"] = "buildx"
+
+	if err := cfg.Save(); err != nil {
+		return errors.Wrap(err, "could not write docker config")
+	}
+	return nil
+}
+
+func installCmd(dockerCli command.Cli) *cobra.Command {
+	var options installOptions
+
+	cmd := &cobra.Command{
+		Use:   "install",
+		Short: "Install buildx as a 'docker builder' alias",
+		Args:  cli.ExactArgs(0),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return runInstall(dockerCli, options)
+		},
+		Hidden: true,
+	}
+
+	return cmd
+}

commands/root.go

@@ -32,6 +32,8 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
 		useCmd(dockerCli),
 		inspectCmd(dockerCli),
 		stopCmd(dockerCli),
+		installCmd(dockerCli),
+		uninstallCmd(dockerCli),
 		imagetoolscmd.RootCmd(dockerCli),
 	)
 }

commands/uninstall.go

@@ -0,0 +1,58 @@
+package commands
+
+import (
+	"os"
+
+	"github.com/docker/cli/cli"
+	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/config"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+type uninstallOptions struct {
+}
+
+func runUninstall(dockerCli command.Cli, in uninstallOptions) error {
+	dir := config.Dir()
+	cfg, err := config.Load(dir)
+	if err != nil {
+		return errors.Wrap(err, "could not load docker config to uninstall 'docker builder' alias")
+	}
+	// config.Load does not return an error if config file does not exist
+	// so let's detect that case, to avoid writing an empty config to disk.
+	if _, err := os.Stat(cfg.Filename); err != nil {
+		if !os.IsNotExist(err) {
+			// should never happen, already handled in config.Load
+			return errors.Wrap(err, "unexpected error loading docker config")
+		}
+		// no-op
+		return nil
+	}
+
+	delete(cfg.Aliases, "builder")
+	if len(cfg.Aliases) == 0 {
+		cfg.Aliases = nil
+	}
+
+	if err := cfg.Save(); err != nil {
+		return errors.Wrap(err, "could not write docker config")
+	}
+	return nil
+}
+
+func uninstallCmd(dockerCli command.Cli) *cobra.Command {
+	var options uninstallOptions
+
+	cmd := &cobra.Command{
+		Use:   "uninstall",
+		Short: "Uninstall the 'docker builder' alias",
+		Args:  cli.ExactArgs(0),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return runUninstall(dockerCli, options)
+		},
+		Hidden: true,
+	}
+
+	return cmd
+}

go.mod

@@ -95,3 +95,5 @@ require (
 )
 
 replace github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
+
+replace github.com/docker/cli => github.com/tiborvass/cli v0.0.0-20190419012645-1ed02c40fe68

go.sum

@@ -63,8 +63,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denisenkom/go-mssqldb v0.0.0-20190315220205-a8ed825ac853 h1:tTngnoO/B6HQnJ+pK8tN7kEAhmhIfaJOutqq/A4/JTM=
 github.com/denisenkom/go-mssqldb v0.0.0-20190315220205-a8ed825ac853/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc=
-github.com/docker/cli v0.0.0-20190321234815-f40f9c240ab0 h1:E7NTtHfZYV+iu35yZ49AbrxqhMHpiOl3FstDYm38vQ0=
-github.com/docker/cli v0.0.0-20190321234815-f40f9c240ab0/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/compose-on-kubernetes v0.4.19-0.20190128150448-356b2919c496 h1:90ytrX1dbzL7Uf/hHiuWwvywC+gikHv4hkAy4CwRTbs=
 github.com/docker/compose-on-kubernetes v0.4.19-0.20190128150448-356b2919c496/go.mod h1:iT2pYfi580XlpaV4KmK0T6+4/9+XoKmk/fhoDod1emE=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible h1:dvc1KSkIYTVjZgHf/CTC2diTYC8PzhaA5sFISRfNVrE=
@@ -256,6 +254,8 @@ github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 h1:b6uOv7YOFK0
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/theupdateframework/notary v0.6.1 h1:7wshjstgS9x9F5LuB1L5mBI2xNMObWqjz+cjWoom6l0=
 github.com/theupdateframework/notary v0.6.1/go.mod h1:MOfgIfmox8s7/7fduvB2xyPPMJCrjRLRizA8OFwpnKY=
+github.com/tiborvass/cli v0.0.0-20190419012645-1ed02c40fe68 h1:NYTot8AmowoFRqpczwLpi7JRKJblipjgfXh3XE+hi5o=
+github.com/tiborvass/cli v0.0.0-20190419012645-1ed02c40fe68/go.mod h1:S/jEQ1OdFvFXmvGs5oicYe8IJS7pBTP99Z0EtGfRs8s=
 github.com/tonistiigi/fsutil v0.0.0-20190327153851-3bbb99cdbd76 h1:eGfgYrNUSD448sa4mxH6nQpyZfN39QH0mLB7QaKIjus=
 github.com/tonistiigi/fsutil v0.0.0-20190327153851-3bbb99cdbd76/go.mod h1:pzh7kdwkDRh+Bx8J30uqaKJ1M4QrSH/um8fcIXeM8rc=
 github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea h1:SXhTLE6pb6eld/v/cCndK0AMpt1wiVFb/YYmqB3/QG0=