Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit efac66c

Browse files
andrewhsuandrewhsu
authored
Merge pull request #221 from vieux/updatecli
[17.09] cli updated vendoring
2 parents 2115479 + 9e5777a commit efac66c

File tree

434 files changed

+58116
-29291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

434 files changed

+58116
-29291
lines changed

‎components/cli/cli/command/container/attach.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"io"
55
"net/http/httputil"
66

7-
"github.com/Sirupsen/logrus"
87
"github.com/docker/cli/cli"
98
"github.com/docker/cli/cli/command"
109
"github.com/docker/docker/api/types"
1110
"github.com/docker/docker/client"
1211
"github.com/docker/docker/pkg/signal"
1312
"github.com/pkg/errors"
13+
"github.com/sirupsen/logrus"
1414
"github.com/spf13/cobra"
1515
"golang.org/x/net/context"
1616
)

‎components/cli/cli/command/container/exec.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"fmt"
55
"io"
66

7-
"github.com/Sirupsen/logrus"
87
"github.com/docker/cli/cli"
98
"github.com/docker/cli/cli/command"
109
"github.com/docker/cli/cli/config/configfile"
@@ -13,6 +12,7 @@ import (
1312
apiclient "github.com/docker/docker/client"
1413
"github.com/docker/docker/pkg/promise"
1514
"github.com/pkg/errors"
15+
"github.com/sirupsen/logrus"
1616
"github.com/spf13/cobra"
1717
"golang.org/x/net/context"
1818
)

‎components/cli/cli/command/container/hijack.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"runtime"
77
"sync"
88

9-
"github.com/Sirupsen/logrus"
109
"github.com/docker/cli/cli/command"
1110
"github.com/docker/docker/api/types"
1211
"github.com/docker/docker/pkg/ioutils"
1312
"github.com/docker/docker/pkg/stdcopy"
1413
"github.com/docker/docker/pkg/term"
14+
"github.com/sirupsen/logrus"
1515
"golang.org/x/net/context"
1616
)
1717

‎components/cli/cli/command/container/opts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"strings"
1212
"time"
1313

14-
"github.com/Sirupsen/logrus"
1514
"github.com/docker/cli/cli/compose/loader"
1615
"github.com/docker/cli/opts"
1716
"github.com/docker/docker/api/types/container"
@@ -20,6 +19,7 @@ import (
2019
"github.com/docker/docker/pkg/signal"
2120
"github.com/docker/go-connections/nat"
2221
"github.com/pkg/errors"
22+
"github.com/sirupsen/logrus"
2323
"github.com/spf13/pflag"
2424
)
2525

‎components/cli/cli/command/container/run.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"strings"
1111
"syscall"
1212

13-
"github.com/Sirupsen/logrus"
1413
"github.com/docker/cli/cli"
1514
"github.com/docker/cli/cli/command"
1615
"github.com/docker/cli/opts"
@@ -20,6 +19,7 @@ import (
2019
"github.com/docker/docker/pkg/signal"
2120
"github.com/docker/docker/pkg/term"
2221
"github.com/pkg/errors"
22+
"github.com/sirupsen/logrus"
2323
"github.com/spf13/cobra"
2424
"github.com/spf13/pflag"
2525
"golang.org/x/net/context"

‎components/cli/cli/command/container/stats_helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"sync"
88
"time"
99

10-
"github.com/Sirupsen/logrus"
1110
"github.com/docker/cli/cli/command/formatter"
1211
"github.com/docker/docker/api/types"
1312
"github.com/docker/docker/client"
1413
"github.com/pkg/errors"
14+
"github.com/sirupsen/logrus"
1515
"golang.org/x/net/context"
1616
)
1717

‎components/cli/cli/command/container/tty.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"runtime"
88
"time"
99

10-
"github.com/Sirupsen/logrus"
1110
"github.com/docker/cli/cli/command"
1211
"github.com/docker/docker/api/types"
1312
"github.com/docker/docker/client"
1413
"github.com/docker/docker/pkg/signal"
14+
"github.com/sirupsen/logrus"
1515
"golang.org/x/net/context"
1616
)
1717

‎components/cli/cli/command/container/utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package container
33
import (
44
"strconv"
55

6-
"github.com/Sirupsen/logrus"
76
"github.com/docker/cli/cli/command"
87
"github.com/docker/docker/api/types"
98
"github.com/docker/docker/api/types/container"
109
"github.com/docker/docker/api/types/events"
1110
"github.com/docker/docker/api/types/filters"
1211
"github.com/docker/docker/api/types/versions"
12+
"github.com/sirupsen/logrus"
1313
"golang.org/x/net/context"
1414
)
1515

‎components/cli/cli/command/events_utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package command
33
import (
44
"sync"
55

6-
"github.com/Sirupsen/logrus"
76
eventtypes "github.com/docker/docker/api/types/events"
7+
"github.com/sirupsen/logrus"
88
)
99

1010
// EventHandler is abstract interface for user to customize

‎components/cli/cli/command/formatter/service.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,10 @@ func (c *serviceContext) Replicas() string {
504504
}
505505

506506
func (c *serviceContext) Image() string {
507-
image := c.service.Spec.TaskTemplate.ContainerSpec.Image
507+
var image string
508+
if c.service.Spec.TaskTemplate.ContainerSpec != nil {
509+
image = c.service.Spec.TaskTemplate.ContainerSpec.Image
510+
}
508511
if ref, err := reference.ParseNormalizedNamed(image); err == nil {
509512
// update image string for display, (strips any digest)
510513
if nt, ok := ref.(reference.NamedTagged); ok {

0 commit comments

Comments
 (0)