From 6d64e0edd32769cd3f59b50883a47c327d35ed04 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sun, 23 Mar 2025 10:27:58 +0100 Subject: [PATCH] fix: sshPkg.Fatal has more nuance See https://git.coopcloud.tech/toolshed/abra/issues/507 --- cli/server/add.go | 3 +-- pkg/ssh/ssh.go | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cli/server/add.go b/cli/server/add.go index 2a99b650..12ca137f 100644 --- a/cli/server/add.go +++ b/cli/server/add.go @@ -103,8 +103,7 @@ developer machine. The domain is then set to "default".`, if _, err := client.New(name, timeout); err != nil { cleanUp(name) - log.Debugf("ssh %s error: %s", name, sshPkg.Fatal(name, err)) - log.Fatalf("can't ssh to %s, make sure \"ssh %s\" works", name, name) + log.Fatalf("ssh %s error: %s", name, sshPkg.Fatal(name, err)) } if created { diff --git a/pkg/ssh/ssh.go b/pkg/ssh/ssh.go index 97d627a0..96489f43 100644 --- a/pkg/ssh/ssh.go +++ b/pkg/ssh/ssh.go @@ -20,6 +20,8 @@ func Fatal(hostname string, err error) error { return fmt.Errorf("ssh auth: permission denied for %s", hostname) } else if strings.Contains(out, "Network is unreachable") { return fmt.Errorf("unable to connect to %s, please check your SSH config", hostname) + } else if strings.Contains(out, "Is the docker daemon running") { + return fmt.Errorf("docker: is the daemon running / your user has docker permissions?") } return err