From a0e45b67857574d921873d7ea2ff3a7093bff2b0 Mon Sep 17 00:00:00 2001
From: Leif Huhn <lhuhn@contextlogic.com>
Date: Mon, 10 Oct 2022 13:11:34 -0400
Subject: [PATCH] Remind user to unlock Mac keychain for certain docker login
 failures.

---
 registry/registry.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/registry/registry.go b/registry/registry.go
index 2a5fa4b..9e26b47 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -3,6 +3,7 @@ package registry
 import (
 	"bytes"
 	"context"
+	log "github.com/sirupsen/logrus"
 	"os"
 	"os/exec"
 	"time"
@@ -18,5 +19,12 @@ func Login(URL, username, password string) error {
 	command.Stdin = bytes.NewBuffer([]byte(password))
 	command.Stdout = os.Stdout
 	command.Stderr = os.Stderr
-	return command.Run()
+
+	err := command.Run()
+
+	if ctx.Err() != nil {
+		log.Println("Timeout during docker login. If on Mac, CONSIDER UNLOCKING THE KEYCHAIN. Run")
+		log.Println("  security -v unlock-keychain ~/Library/Keychains/login.keychain-db")
+	}
+	return err
 }