Merge pull request #39 from tonistiigi/commands-fixes

commands: environment detection validation

commands/create.go

@@ -119,6 +119,10 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
 				return err
 			}
 		} else {
+			if dockerCli.CurrentContext() == "default" && dockerCli.DockerEndpoint().TLSData != nil {
+				return errors.Errorf("could not create a builder instance with TLS data loaded from environment. Please use `docker context create <context-name>` to create a context for current environment and then create a builder instance with `docker buildx create <context-name>`")
+			}
+
 			ep, err = getCurrentEndpoint(dockerCli)
 			if err != nil {
 				return err

commands/use.go

@@ -23,6 +23,9 @@ func runUse(dockerCli command.Cli, in useOptions, name string) error {
 
 	if _, err := txn.NodeGroupByName(name); err != nil {
 		if os.IsNotExist(errors.Cause(err)) {
+			if name == "default" && name != dockerCli.CurrentContext() {
+				return errors.Errorf("run `docker context use default` to switch to default context")
+			}
 			if name == "default" || name == dockerCli.CurrentContext() {
 				ep, err := getCurrentEndpoint(dockerCli)
 				if err != nil {