Update logrus to v1.0.1 by dmcgowan · Pull Request #1856 · moby/libnetwork

dmcgowan · 2017-07-26T21:22:17Z

Updates logrus to v1.0.1 and fixes the vendor case sensitivity issue. This issue is being fixed in parallel with many other projects to prevent future vendoring errors.

See https://github.com/sirupsen/logrus#logrus-

mlaventure · 2017-07-31T21:53:54Z

@dmcgowan needs a little rebase :)

fcrisciani · 2017-08-03T20:27:53Z

@dmcgowan if you can rebase and solve the conflict we can have this PR get in

mavenugo · 2017-08-05T20:40:42Z

@dmcgowan this is blocking the upcoming libnetwork vendoring due to the change (moby/moby#34272) which was merged.

dmcgowan · 2017-08-05T21:20:00Z

Pushed an update. This change is a lot bigger than it should be. The vendor was pretty out of sync compared to what is used by moby and swarmkit. I have updated the needed packages to match. If the changes cause issues, that is another issue since upgrading this vendor downstream will be using these versions....

fcrisciani · 2017-08-07T15:25:27Z

@dmcgowan looks like there is still missing dependencies PTAL

Fix case sensitivity issue Update docker and runc vendors Signed-off-by: Derek McGowan <derek@mcgstyle.net>

dmcgowan · 2017-08-07T18:49:11Z

Update, not sure how latest CI error would be related

I changed the vendors to exclude any potential functional changes in the update. I would encourage the maintainers of this project to update the vendored versions. As is, the out of date vendors makes importing libnetwork riskier as it has not been tested with the versions of the packages it is likely to be used with in Docker and SwarmKit.

fcrisciani · 2017-08-08T18:07:03Z

LGTM

fcrisciani · 2017-08-08T18:07:34Z

vendor.conf

 github.com/mattn/go-shellwords 525bedee691b5a8df547cb5cf9f86b7fb1883e24
 github.com/miekg/dns d27455715200c7d3e321a1e5cadb27c9ee0b0f02
-github.com/opencontainers/runc ba1568de399395774ad84c2ace65937814c542ed
+github.com/opencontainers/runc 8694d576ea3ce3c9e2c804b7f91b4e1e9a575d1c https://github.com/dmcgowan/runc.git


From moby/moby the git commit is:
github.com/opencontainers/runc e9325d442f5979c4f79bfa9e09bdf7abb74ba03b https://github.com/dmcgowan/runc.git
Should we keep this aligned?

fcrisciani · 2017-08-08T18:07:42Z

vendor.conf

-github.com/docker/docker 9c96768eae4b3a65147b47a55c850c103ab8972d
-github.com/docker/go-connections 34b5052da6b11e27f5f2e357b38b571ddddd3928
-github.com/docker/go-events 2e7d352816128aa84f4d29b2a21d400133701a0d
+github.com/docker/docker 2cac43e3573893cf8fd816e0ad5615426acb87f4 https://github.com/dmcgowan/docker.git


Are these still to be migrated?

can this one be the master one now that the logrus changes are in already there?

fcrisciani

question on some vendoring

fcrisciani · 2017-08-08T20:31:12Z

Tried to vendor the same runc of moby and the latest moby master but hit some extra dependency issue:

go build -tags experimental -o "bin/dnet" ./cmd/dnet                
vendor/github.com/docker/docker/daemon/cluster/convert/config.go:5:2: cannot find package "github.com/docker/swarmkit/api" in any of:   
        /go/src/github.com/docker/libnetwork/vendor/github.com/docker/swarmkit/api (vendor tree)                                        
        /usr/local/go/src/github.com/docker/swarmkit/api (from $GOROOT)                                                                 
        /go/src/github.com/docker/swarmkit/api (from $GOPATH)       
vendor/github.com/docker/docker/daemon/cluster/convert/service.go:11:2: cannot find package "github.com/docker/swarmkit/api/genericresource" in any of:                                                                                                                         
        /go/src/github.com/docker/libnetwork/vendor/github.com/docker/swarmkit/api/genericresource (vendor tree)                        
        /usr/local/go/src/github.com/docker/swarmkit/api/genericresource (from $GOROOT)                                                 
        /go/src/github.com/docker/swarmkit/api/genericresource (from $GOPATH)                                                           
vendor/github.com/docker/docker/daemon/cluster/convert/swarm.go:10:2: cannot find package "github.com/docker/swarmkit/ca" in any of:    
        /go/src/github.com/docker/libnetwork/vendor/github.com/docker/swarmkit/ca (vendor tree)                                         
        /usr/local/go/src/github.com/docker/swarmkit/ca (from $GOROOT)                                                                  
        /go/src/github.com/docker/swarmkit/ca (from $GOPATH)        
vendor/github.com/docker/docker/daemon/cluster/convert/config.go:6:2: cannot find package "github.com/gogo/protobuf/types" in any of:   
        /go/src/github.com/docker/libnetwork/vendor/github.com/gogo/protobuf/types (vendor tree)                                        
        /usr/local/go/src/github.com/gogo/protobuf/types (from $GOROOT)                                                                 
        /go/src/github.com/gogo/protobuf/types (from $GOPATH)       
vendor/github.com/docker/docker/api/types/registry/registry.go:7:2: cannot find package "github.com/opencontainers/image-spec/specs-go/v1" in any of:                                                                                                                           
        /go/src/github.com/docker/libnetwork/vendor/github.com/opencontainers/image-spec/specs-go/v1 (vendor tree)                      
        /usr/local/go/src/github.com/opencontainers/image-spec/specs-go/v1 (from $GOROOT)                                               
        /go/src/github.com/opencontainers/image-spec/specs-go/v1 (from $GOPATH)                                                         
vendor/github.com/opencontainers/runc/libcontainer/configs/config.go:10:2: cannot find package "github.com/opencontainers/runtime-spec/specs-go" in any of:                                                                                                                     
        /go/src/github.com/docker/libnetwork/vendor/github.com/opencontainers/runtime-spec/specs-go (vendor tree)                       
        /usr/local/go/src/github.com/opencontainers/runtime-spec/specs-go (from $GOROOT)                                                
        /go/src/github.com/opencontainers/runtime-spec/specs-go (from $GOPATH)

mavenugo · 2017-08-08T20:59:51Z

Thanks @fcrisciani .... Lets use #1899 to track this change and get this PR merged asap so that vendoring can happen in moby.

dmcgowan mentioned this pull request Jul 26, 2017

Update logrus to v1.0.1 (Sirupsen -> sirupsen) moby/moby#34272

Merged

5 tasks

dmcgowan force-pushed the update-logrus branch from 0202bb2 to d41b70f Compare August 5, 2017 21:18

thaJeztah mentioned this pull request Aug 6, 2017

Vendoring libnetwork moby/moby#34378

Merged

dmcgowan force-pushed the update-logrus branch from d41b70f to 28d1e4e Compare August 7, 2017 17:56

Update logrus to v1.0.1

43f00b7

Fix case sensitivity issue Update docker and runc vendors Signed-off-by: Derek McGowan <derek@mcgstyle.net>

dmcgowan force-pushed the update-logrus branch from 28d1e4e to 43f00b7 Compare August 7, 2017 18:20

fcrisciani reviewed Aug 8, 2017

View reviewed changes

fcrisciani mentioned this pull request Aug 8, 2017

Realign vendor with moby/moby #1899

Closed

mavenugo approved these changes Aug 8, 2017

View reviewed changes

mavenugo merged commit 19ac3ea into moby:master Aug 8, 2017

Conversation

dmcgowan commented Jul 26, 2017

Uh oh!

mlaventure commented Jul 31, 2017

Uh oh!

fcrisciani commented Aug 3, 2017

Uh oh!

mavenugo commented Aug 5, 2017

Uh oh!

dmcgowan commented Aug 5, 2017

Uh oh!

fcrisciani commented Aug 7, 2017

Uh oh!

dmcgowan commented Aug 7, 2017

Uh oh!

fcrisciani commented Aug 8, 2017

Uh oh!

fcrisciani Aug 8, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fcrisciani Aug 8, 2017

Choose a reason for hiding this comment

Uh oh!

fcrisciani Aug 8, 2017

Choose a reason for hiding this comment

Uh oh!

fcrisciani Aug 8, 2017

Choose a reason for hiding this comment

Uh oh!

fcrisciani left a comment

Choose a reason for hiding this comment

Uh oh!

fcrisciani commented Aug 8, 2017

Uh oh!

mavenugo commented Aug 8, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

fcrisciani Aug 8, 2017 •

edited

Loading