X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/927524f1be454de021180b74999d682780b8cb6b..35e9b21d80569fec8860596213c72d199f79a593:/cmd/arvados-client/container_gateway.go

diff --git a/cmd/arvados-client/container_gateway.go b/cmd/arvados-client/container_gateway.go
index aca6c5b797..55f8c33bc7 100644
--- a/cmd/arvados-client/container_gateway.go
+++ b/cmd/arvados-client/container_gateway.go
@@ -160,7 +160,9 @@ Options:
 		fmt.Fprintf(stderr, "target UUID is not a container or container request UUID: %s\n", targetUUID)
 		return 1
 	}
-	sshconn, err := rpcconn.ContainerSSH(context.TODO(), arvados.ContainerSSHOptions{
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	sshconn, err := rpcconn.ContainerSSH(ctx, arvados.ContainerSSHOptions{
 		UUID:          targetUUID,
 		DetachKeys:    *detachKeys,
 		LoginUsername: loginUsername,
@@ -176,7 +178,6 @@ Options:
 		return 0
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
 	go func() {
 		defer cancel()
 		_, err := io.Copy(stdout, sshconn.Conn)