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.

Sign up for GitHub

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

Jump to bottom

Vendor fsouza/go-docker-client update #7550

Merged
merged 5 commits into from
Mar 31, 2020
Merged

Vendor fsouza/go-docker-client update #7550

merged 5 commits into from
Mar 31, 2020

Conversation

notnoop
Copy link
Contributor

@notnoop notnoop commented Mar 30, 2020 •
edited
Loading

Reprise of #7416. Thanks @greut .

Also, includes some docker vendoring tweaks to ensure that all github.com/docker/docker packages are of v19.03.8

Also fixes #6085

Mahmood Ali added 2 commits March 30, 2020 15:02
vendoring: Update docker packages to v19.03.8
8a96c85 
Also, since github.com/docker/docker is the canonical package names and
is transparently forwarded to github.com/moby/moby, I removed the
moby/moby references in origin.
vendors: update fsouza/go-docker-client to v.1.6.3
d851b00
@notnoop notnoop self-assigned this Mar 30, 2020
@notnoop notnoop added this to Triaged in Nomad - Community Issues Triage via automation Mar 30, 2020
@tgross
Copy link
Member

tgross commented Mar 30, 2020

This looks like it still has Windows build issues:

==> Building pkg/windows_amd64/nomad with tags codegen_generated...
# github.com/hashicorp/nomad/vendor/github.com/docker/docker/pkg/system
vendor/github.com/docker/docker/pkg/system/filesys_windows.go:111:24: cannot use uintptr(unsafe.Pointer(&sd[0])) (type uintptr) as type *"github.com/hashicorp/nomad/vendor/golang.org/x/sys/windows".SECURITY_DESCRIPTOR in assignment
make: *** [GNUmakefile:120: pkg/windows_amd64/nomad] Error 2

and some Linux build issues:

==> Building pkg/linux_amd64/nomad with tags codegen_generated ...
vendor/github.com/docker/docker/pkg/archive/archive_linux.go:12:2: cannot find package "github.com/containerd/continuity/fs" in any of:
	/home/circleci/go/src/github.com/hashicorp/nomad/vendor/github.com/containerd/continuity/fs (vendor tree)
	/usr/local/go/src/github.com/containerd/continuity/fs (from $GOROOT)
	/home/circleci/go/src/github.com/containerd/continuity/fs (from $GOPATH)
GNUmakefile:82: recipe for target 'pkg/linux_amd64/nomad' failed

@notnoop
Copy link
Contributor Author

notnoop commented Mar 30, 2020

@tgross sorry - I need to fix CI first before requesting review :( .

Mahmood Ali added 3 commits March 30, 2020 15:30
vendor: github.com/containerd/continuity pkgs
ae75164
Fix docker/docker compile issue
a5e16de 
Use docker master branch for specific branches, so we can pick up the
fix in moby/moby#40021 .
driver/docker: fix memory swapping
2def8de 
MemorySwappiness can only be set in non-Windows options: https://ci.appveyor.com/project/hashicorp/nomad/builds/31832149

Also fixes #6085
@notnoop
Copy link
Contributor Author

notnoop commented Mar 30, 2020

This is ready for review again - all green and is passing Windows appveyor tests too

tgross
tgross approved these changes Mar 31, 2020
View reviewed changes
Copy link
Member

@tgross tgross left a comment

Choose a reason for hiding this comment

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

LGTM!

@greut
Copy link
Contributor

greut commented Mar 31, 2020

@notnoop brilliant!

@notnoop notnoop merged commit b1bf952 into master Mar 31, 2020
Nomad - Community Issues Triage automation moved this from Triaged to Done Mar 31, 2020
@notnoop notnoop deleted the vendor-fsouza-go-docker-client-20200330 branch March 31, 2020 12:46
This was referenced Mar 31, 2020
Closed
Closed
@tgross tgross mentioned this pull request Apr 6, 2020
Closed
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 12, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@tgross tgross tgross approved these changes

@drewbailey drewbailey Awaiting requested review from drewbailey

Assignees

@notnoop notnoop

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Docker containers use swap in 0.9.4
3 participants
@notnoop @tgross @greut