Fixed Vendor for sirupsen/logrus

Fixed namechange in `Sirupsen/logrus` to `sirupsen/logrus`

Signed-off-by: Suraj Narwade <[email protected]>
Signed-off-by: Vincent Demeester <[email protected]>

Author: surajnarwade

cli/app/app.go

@@ -10,10 +10,10 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libcompose/project"
 	"github.com/docker/libcompose/project/options"
 	"github.com/docker/libcompose/version"
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
 

cli/app/events.go

@@ -8,9 +8,9 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libcompose/project"
 	"github.com/docker/libcompose/project/events"
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
 

cli/app/version.go

@@ -6,8 +6,8 @@ import (
 	"runtime"
 	"text/template"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libcompose/version"
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
 

cli/docker/app/commands.go

@@ -1,10 +1,10 @@
 package app
 
 import (
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libcompose/cli/command"
 	"github.com/docker/libcompose/docker/client"
 	"github.com/docker/libcompose/docker/ctx"
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
 

config/interpolation.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 var defaultValues = make(map[string]string)

config/merge_v1.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"path"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libcompose/utils"
+	"github.com/sirupsen/logrus"
 )
 
 // MergeServicesV1 merges a v1 compose file into an existing set of service configs

config/merge_v2.go

@@ -5,8 +5,8 @@ import (
 	"path"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/libcompose/utils"
+	"github.com/sirupsen/logrus"
 )
 
 // MergeServicesV2 merges a v2 compose file into an existing set of service configs

docker/builder/builder.go

@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/cli/cli/command/image/build"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/builder/dockerignore"
@@ -20,6 +19,7 @@ import (
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/pkg/term"
 	"github.com/docker/libcompose/logger"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 )
 

docker/container/container.go

@@ -11,19 +11,18 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/promise"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/docker/docker/pkg/term"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/libcompose/config"
 	"github.com/docker/libcompose/labels"
 	"github.com/docker/libcompose/logger"
 	"github.com/docker/libcompose/project"
+	"github.com/sirupsen/logrus"
 )
 
 // 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
 	}
 
 	// holdHijackedConnection (in goroutine)
-	errCh = promise.Go(func() error {
-		return holdHijackedConnection(configOverride.Tty, in, out, stderr, resp)
-	})
+	errCh = make(chan error, 1)
+	go func() {
+		errCh <- holdHijackedConnection(configOverride.Tty, in, out, stderr, resp)
+	}()
 
 	if err := c.client.ContainerStart(ctx, c.container.ID, types.ContainerStartOptions{}); err != nil {
 		return -1, err

docker/container/functions.go

@@ -32,7 +32,7 @@ func ListByFilter(ctx context.Context, clientInstance client.ContainerAPIClient,
 func Get(ctx context.Context, clientInstance client.ContainerAPIClient, id string) (*types.ContainerJSON, error) {
 	container, err := clientInstance.ContainerInspect(ctx, id)
 	if err != nil {
-		if client.IsErrContainerNotFound(err) {
+		if client.IsErrNotFound(err) {
 			return nil, nil
 		}
 		return nil, err