Skip to content

Commit

Permalink
Fixed bad merge (mixed cc and ctx)
Browse files Browse the repository at this point in the history
  • Loading branch information
codepope committed Jun 18, 2020
1 parent 1e122a8 commit 5a373b7
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions cmd/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package cmd
import (
"fmt"
"github.com/superfly/flyctl/cmdctx"
"github.com/superfly/flyctl/docker"
"os"
"os/exec"
"time"
Expand Down Expand Up @@ -252,9 +251,9 @@ func runAuthDocker(ctx *cmdctx.CmdContext) error {
return errors.Wrap(err, "docker cli not found - make sure it's installed and try again")
}

token, _ := cc.GlobalConfig.GetString(flyctl.ConfigAPIToken)
token, _ := ctx.GlobalConfig.GetString(flyctl.ConfigAPIToken)

cmd := exec.CommandContext(ctx, binary, "login", "--username=x", "--password-stdin", "registry.fly.io")
cmd := exec.CommandContext(cc, binary, "login", "--username=x", "--password-stdin", "registry.fly.io")
stdin, err := cmd.StdinPipe()
if err != nil {
return err
Expand Down

0 comments on commit 5a373b7

Please sign in to comment.