Skip to content

Commit df18be8

Browse files
committed
fix: Check if docker daemon can be reached
The client can be created just fine without an active docker daemon. It needs to be actively checked before usage for tailfin to not hang.
1 parent 7ffaada commit df18be8

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

cmd/tailfincmd/cmd.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ func (o *options) Complete(args []string) error {
113113
}
114114

115115
var err error
116-
// TODO More error handling here. err == nil even if no daemon is found
117116
o.dockerClient, err = dockerclient.NewClientWithOpts(dockerclient.FromEnv, dockerclient.WithAPIVersionNegotiation())
118117
if err != nil {
119118
panic(err)
@@ -143,6 +142,11 @@ func (o *options) Run(cmd *cobra.Command) error {
143142
ctx, cancel := context.WithCancel(context.Background())
144143
defer cancel()
145144

145+
_, err = o.dockerClient.Ping(ctx)
146+
if err != nil {
147+
return err
148+
}
149+
146150
return stern.RunDocker(ctx, o.dockerClient, config)
147151
}
148152

0 commit comments

Comments
 (0)