Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Porting libnetwork fixes #29004

Merged
merged 2 commits into from
Dec 3, 2016
Merged

Porting libnetwork fixes #29004

merged 2 commits into from
Dec 3, 2016

Conversation

Signed-off-by: Alessandro Boch <[email protected]>
@vieux
Copy link
Contributor

vieux commented Dec 1, 2016

@aboch looks like issues

@aboch
Copy link
Contributor Author

aboch commented Dec 1, 2016

Not sure about vendor failure:

00:33:28 hack/dind: line 29: /go/src/github.com/docker/docker/hack/validate/vendor: No such file or directory
00:33:29 Build step 'Execute shell' marked build as failure

It looks like it is looking for the validate directory that was added for the new vendoring, which is not present in 1.12.x branch.

@vdemeester vdemeester added status/2-code-review status/failing-ci Indicates that the PR in its current state fails the test suite and removed status/0-triage labels Dec 1, 2016
@anusha-ragunathan
Copy link
Contributor

experimental is failing because in 1.12, plugins are still in experimental.

The media type for plugins was changed in 1.13 to application/vnd.docker.plugin.v1+json https://github.com/docker/distribution/blob/4ad885a6725bfca9ea00bd87341e367c0f919560/manifest/schema2/manifest.go#L21. As a result, the sample plugin we use in integration tests tiborvass/no-remove was re-pushed to Hub using this new mediatype.

That's why the tests are failing. We have 2 options:

  1. Backport the plugin mediatype changes to 1.12.x
  2. Repush a 1.12 version of tiborvass/no-remove that has the old mediatype and update the tests to use it.

I prefer (1)

@anusha-ragunathan
Copy link
Contributor

For the plugin mediatype changes, we need 970b23d

@anusha-ragunathan
Copy link
Contributor

@vieux
Copy link
Contributor

vieux commented Dec 2, 2016

@johnstep can you please try this one, since there is no CI for 1.12.x on Windows

@johnstep
Copy link
Member

johnstep commented Dec 2, 2016

LGTM on Windows. It built successfully on Windows (for Windows) and all unit tests passed. I rebuilt and tested again with the resulting binaries, and that succeeded.

@@ -143,7 +143,8 @@ func Pull(name string, rs registry.Service, metaheader http.Header, authConfig *
logrus.Debugf("pull.go: error in json.Unmarshal(): %v", err)
return nil, err
}
if m.Config.MediaType != MediaTypeConfig {
if m.Config.MediaType != MediaTypeConfig &&
m.Config.MediaType != "application/vnd.docker.plugin.v0+json" {
Copy link
Contributor

Choose a reason for hiding this comment

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

If this check is updated as follows, we should be good:

if m.Config.MediaType != MediaTypeConfig &&
   m.Config.MediaType != "application/vnd.docker.plugin.v0+json" &&
   m.Config.MediaType != "application/vnd.docker.plugin.image.v0+json"{
...
}

@anusha-ragunathan
Copy link
Contributor

All experimental tests are failing due to the known plugin mediatype issue. It can be fixed by updating the code to accommodate to the expected media type of the sample plugin. Or the sample plugin can be re-pushed by @tiborvass

In either case, this PR can be merged, since the failing tests are unrelated to the PR.

@vieux vieux changed the title Porting libnetwork fixes to 1.12.x [1.12.x] Porting libnetwork fixes Dec 2, 2016
@vieux
Copy link
Contributor

vieux commented Dec 2, 2016

LGTM ping @LK4D4 @tonistiigi

@aboch
Copy link
Contributor Author

aboch commented Dec 2, 2016

@anusha-ragunathan Thanks for your help in trying to solve the experimental failure on 1.12.x.
Given it is currently broken, I feel it would be more efficient if you guys address the plugin failure on experimental ci issue via a separate PR. Will also give you more control over what to change. After that is merged we can rebase our vendoring (libnetwork/swarmkit) PRs .
I went ahead and removed the uncomplete media type changes commit from this PR.

@anusha-ragunathan
Copy link
Contributor

@aboch : Yessir! #29089

@vieux
Copy link
Contributor

vieux commented Dec 2, 2016

@tonistiigi windows is expected to fail

@vieux vieux removed rebuild/windowsRS1 status/failing-ci Indicates that the PR in its current state fails the test suite labels Dec 2, 2016
@mavenugo
Copy link
Contributor

mavenugo commented Dec 3, 2016

#29089 handles the experimental failures.

LGTM

@vieux vieux merged commit f25e197 into moby:1.12.x Dec 3, 2016
@vieux vieux added this to the 1.12.4 milestone Dec 7, 2016
@vieux vieux changed the title [1.12.x] Porting libnetwork fixes Porting libnetwork fixes Dec 7, 2016
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.

9 participants