toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #427 from vdemeester/import-templates-from-docker-pkg

Browse Source 
Import templates from docker pkg
Upstream-commit: f3c325f390
Component: cli
This commit is contained in:
Daniel Nephin
2017-08-08 11:55:58 -04:00
committed by GitHub
parent bee0cb9a32 e6ade3ec40
commit 763e45c80b
9 changed files with 96 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/cli/cli/command/container/list.go
View File

@ -7,8 +7,8 @@ import (
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/formatter"
"github.com/docker/cli/opts"
"github.com/docker/cli/templates"
"github.com/docker/docker/api/types"
"github.com/docker/docker/pkg/templates"
"github.com/spf13/cobra"
"golang.org/x/net/context"
)

2
components/cli/cli/command/formatter/formatter.go
View File

@ -7,7 +7,7 @@ import (
"text/tabwriter"
"text/template"
"github.com/docker/docker/pkg/templates"
"github.com/docker/cli/templates"
"github.com/pkg/errors"
)

2
components/cli/cli/command/inspect/inspector.go
View File

@ -9,7 +9,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/docker/cli/cli"
"github.com/docker/docker/pkg/templates"
"github.com/docker/cli/templates"
"github.com/pkg/errors"
)

2
components/cli/cli/command/inspect/inspector_test.go
View File

@ -5,7 +5,7 @@ import (
"strings"
"testing"
"github.com/docker/docker/pkg/templates"
"github.com/docker/cli/templates"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

2
components/cli/cli/command/system/events.go
View File

@ -12,10 +12,10 @@ import (
"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/opts"
"github.com/docker/cli/templates"
"github.com/docker/docker/api/types"
eventtypes "github.com/docker/docker/api/types/events"
"github.com/docker/docker/pkg/jsonlog"
"github.com/docker/docker/pkg/templates"
"github.com/spf13/cobra"
"golang.org/x/net/context"
)

2
components/cli/cli/command/system/info.go
View File

@ -9,9 +9,9 @@ import (
"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/debug"
"github.com/docker/cli/templates"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/pkg/templates"
"github.com/docker/go-units"
"github.com/spf13/cobra"
"golang.org/x/net/context"

2
components/cli/cli/command/system/version.go
View File

@ -8,8 +8,8 @@ import (
"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/templates"
"github.com/docker/docker/api/types"
"github.com/docker/docker/pkg/templates"
"github.com/spf13/cobra"
)