Skip to content

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 29, 2017

This includes a fix for API version negotiation: moby/moby#35008

I may need some help on this one w.r.t. the local changes needed; unit-tests hung for me locally, so likely I messed something up, but pushed here as a start

edit: looks like hanging may be just with me locally; I'll have to check why..

}

return archive.PreserveTrailingDotOrSeparator(absPath, localPath), nil
return archive.PreserveTrailingDotOrSeparator(absPath, localPath, filepath.Separator), nil
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping @johnstep to check if this one is correct (LCOW related)

@thaJeztah
Copy link
Member Author

ping @dnephin @vdemeester if we want this updated before 17.10 is cut off

@codecov-io
Copy link

codecov-io commented Sep 29, 2017

Codecov Report

Merging #570 into master will decrease coverage by 0.03%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master     #570      +/-   ##
==========================================
- Coverage   49.42%   49.39%   -0.04%     
==========================================
  Files         208      208              
  Lines       17164    17175      +11     
==========================================
  Hits         8483     8483              
- Misses       8248     8259      +11     
  Partials      433      433

@thaJeztah thaJeztah changed the title [WIP] Bump moby vendor to 14ce1f1cf48e9859223c6311de58aec4dc Bump moby vendor to 14ce1f1cf48e9859223c6311de58aec4dc Sep 29, 2017
@thaJeztah
Copy link
Member Author

FYI: running locally (D4M), it got stuck at;

--- PASS: TestResolveService (0.00s)
PASS
ok  	github.com/docker/cli/cli/command/idresolver	0.027s

Copy link
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐮

@dnephin
Copy link
Contributor

dnephin commented Sep 29, 2017

looks like hanging may be just with me locally; I'll have to check why..

@thaJeztah TestRunBuildFromGitHubSpecialCase added in #390 prompts for input if run with a tty 👼 This prompt is sometimes hidden by other test output , which makes it look like it's hanging.

If you're running without -v then I think the image suite would be immediate after the last line you saw

vendor.conf Outdated
# TODO remove this once tonistiigi/fsutil switched, and was vendored (https://github.com/tonistiigi/fsutil/pull/15)
github.com/stevvooe/continuity 22694c680ee48fb8f50015b44618517e2bde77e8
github.com/moby/buildkit aaff9d591ef128560018433fe61beb802e149de8
github.com/tonistiigi/fsutil 1dedf6e90084bd88c4c518a15e68a37ed1370203
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep this file sorted alphabetically instead of these adhoc groupings

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, let me update 👍

@thaJeztah
Copy link
Member Author

prompts for input if run with a tty

Oh! I saw that popup, then go away so thought it worked; yes, that would explain it!

…0f046c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

vendor.conf updated to be in alphabetical order again; PTAL

Copy link
Contributor

@dnephin dnephin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Member Author

ready to go, or do we need a check from @johnstep for #570 (comment) ?

@thaJeztah thaJeztah merged commit 31908a4 into docker:master Sep 29, 2017
@GordonTheTurtle GordonTheTurtle added this to the 17.10.0 milestone Sep 29, 2017
@thaJeztah thaJeztah deleted the bump-moby-vendor branch September 29, 2017 21:08
@thaJeztah
Copy link
Member Author

discussed offline with @dnephin ^^

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants