Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 57bd716

Browse files
author
Vincent Demeester
authored
Merge pull request #498 from surajnarwade/fix-logrus
Fixed Vendor for `sirupsen/logrus`
2 parents b2c0c6e + 6cfd21b commit 57bd716

File tree

551 files changed

+74323
-32082
lines changed

Some content is hidden

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

551 files changed

+74323
-32082
lines changed

‎cli/app/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010

1111
"golang.org/x/net/context"
1212

13-
"github.com/Sirupsen/logrus"
1413
"github.com/docker/libcompose/project"
1514
"github.com/docker/libcompose/project/options"
1615
"github.com/docker/libcompose/version"
16+
"github.com/sirupsen/logrus"
1717
"github.com/urfave/cli"
1818
)
1919

‎cli/app/events.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88

99
"golang.org/x/net/context"
1010

11-
"github.com/Sirupsen/logrus"
1211
"github.com/docker/libcompose/project"
1312
"github.com/docker/libcompose/project/events"
13+
"github.com/sirupsen/logrus"
1414
"github.com/urfave/cli"
1515
)
1616

‎cli/app/version.go

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

9-
"github.com/Sirupsen/logrus"
109
"github.com/docker/libcompose/version"
10+
"github.com/sirupsen/logrus"
1111
"github.com/urfave/cli"
1212
)
1313

‎cli/docker/app/commands.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package app
22

33
import (
4-
"github.com/Sirupsen/logrus"
54
"github.com/docker/libcompose/cli/command"
65
"github.com/docker/libcompose/docker/client"
76
"github.com/docker/libcompose/docker/ctx"
7+
"github.com/sirupsen/logrus"
88
"github.com/urfave/cli"
99
)
1010

‎config/interpolation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/Sirupsen/logrus"
8+
"github.com/sirupsen/logrus"
99
)
1010

1111
var defaultValues = make(map[string]string)

‎config/merge_v1.go

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

7-
"github.com/Sirupsen/logrus"
87
"github.com/docker/libcompose/utils"
8+
"github.com/sirupsen/logrus"
99
)
1010

1111
// MergeServicesV1 merges a v1 compose file into an existing set of service configs

‎config/merge_v2.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"path"
66
"strings"
77

8-
"github.com/Sirupsen/logrus"
98
"github.com/docker/libcompose/utils"
9+
"github.com/sirupsen/logrus"
1010
)
1111

1212
// MergeServicesV2 merges a v2 compose file into an existing set of service configs

‎docker/builder/builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"path/filepath"
99
"strings"
1010

11-
"github.com/Sirupsen/logrus"
1211
"github.com/docker/cli/cli/command/image/build"
1312
"github.com/docker/docker/api/types"
1413
"github.com/docker/docker/builder/dockerignore"
@@ -20,6 +19,7 @@ import (
2019
"github.com/docker/docker/pkg/streamformatter"
2120
"github.com/docker/docker/pkg/term"
2221
"github.com/docker/libcompose/logger"
22+
"github.com/sirupsen/logrus"
2323
"golang.org/x/net/context"
2424
)
2525

‎docker/container/container.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,18 @@ import (
1111

1212
"golang.org/x/net/context"
1313

14-
"github.com/Sirupsen/logrus"
1514
"github.com/docker/docker/api/types"
1615
"github.com/docker/docker/api/types/container"
1716
"github.com/docker/docker/api/types/network"
1817
"github.com/docker/docker/client"
19-
"github.com/docker/docker/pkg/promise"
2018
"github.com/docker/docker/pkg/stdcopy"
2119
"github.com/docker/docker/pkg/term"
2220
"github.com/docker/go-connections/nat"
2321
"github.com/docker/libcompose/config"
2422
"github.com/docker/libcompose/labels"
2523
"github.com/docker/libcompose/logger"
2624
"github.com/docker/libcompose/project"
25+
"github.com/sirupsen/logrus"
2726
)
2827

2928
// Container holds information about a docker container and the service it is tied on.
@@ -215,9 +214,10 @@ func (c *Container) Run(ctx context.Context, configOverride *config.ServiceConfi
215214
}
216215

217216
// holdHijackedConnection (in goroutine)
218-
errCh = promise.Go(func() error {
219-
return holdHijackedConnection(configOverride.Tty, in, out, stderr, resp)
220-
})
217+
errCh = make(chan error, 1)
218+
go func() {
219+
errCh <- holdHijackedConnection(configOverride.Tty, in, out, stderr, resp)
220+
}()
221221

222222
if err := c.client.ContainerStart(ctx, c.container.ID, types.ContainerStartOptions{}); err != nil {
223223
return -1, err

‎docker/container/functions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func ListByFilter(ctx context.Context, clientInstance client.ContainerAPIClient,
3232
func Get(ctx context.Context, clientInstance client.ContainerAPIClient, id string) (*types.ContainerJSON, error) {
3333
container, err := clientInstance.ContainerInspect(ctx, id)
3434
if err != nil {
35-
if client.IsErrContainerNotFound(err) {
35+
if client.IsErrNotFound(err) {
3636
return nil, nil
3737
}
3838
return nil, err

0 commit comments

Comments
 (0)