wait for WireGuard tunnel before creating Docker client

superfly · Aug 13, 2021 · c5fa194 · c5fa194
1 parent 302d2fc
commit c5fa194
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/internal/build/imgsrc/docker.go b/internal/build/imgsrc/docker.go
@@ -215,6 +215,12 @@ func newRemoteDockerClient(ctx context.Context, apiClient *api.Client, appName s
 				return errors.Wrapf(err, "error establishing wireguard connection for %s organization", app.Organization.Slug)
 			}
 
+			tunnelCtx, cancel := context.WithTimeout(errCtx, 4*time.Minute)
+			defer cancel()
+			if err = agentclient.WaitForTunnel(tunnelCtx, &app.Organization); err != nil {
+				return errors.Wrap(err, "unable to connect WireGuard tunnel")
+			}
+
 			opts = append(opts, dockerclient.WithDialContext(dialer.DialContext))
 		} else {
 			terminal.Debug("connecting to remote docker daemon over host wireguard tunnel")