@@ -1,7 +1,6 @@

 package secret

 import (

-	"context"

 	"fmt"

 	"io/ioutil"

 	"os"

@@ -12,6 +11,7 @@ import (

 	"github.com/docker/docker/opts"

 	runconfigopts "github.com/docker/docker/runconfig/opts"

 	"github.com/spf13/cobra"

+	"golang.org/x/net/context"

 )

 type createOptions struct {

@@ -1,12 +1,11 @@

 package secret

 import (

-	"context"

-

 	"github.com/docker/docker/cli"

 	"github.com/docker/docker/cli/command"

 	"github.com/docker/docker/cli/command/inspect"

 	"github.com/spf13/cobra"

+	"golang.org/x/net/context"

 )

 type inspectOptions struct {

@@ -1,7 +1,6 @@

 package secret

 import (

-	"context"

 	"fmt"

 	"text/tabwriter"

 	"time"

@@ -11,6 +10,7 @@ import (

 	"github.com/docker/docker/cli/command"

 	"github.com/docker/go-units"

 	"github.com/spf13/cobra"

+	"golang.org/x/net/context"

 )

 type listOptions struct {

@@ -1,12 +1,12 @@

 package secret

 import (

-	"context"

 	"fmt"

 	"github.com/docker/docker/cli"

 	"github.com/docker/docker/cli/command"

 	"github.com/spf13/cobra"

+	"golang.org/x/net/context"

 )

 type removeOptions struct {

@@ -1,12 +1,11 @@

 package secret

 import (

-	"context"

-

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/swarm"

 	"github.com/docker/docker/client"

+	"golang.org/x/net/context"

 )

 func getSecretsByName(client client.APIClient, ctx context.Context, names []string) ([]swarm.Secret, error) {