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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a96c85
vendoring: Update docker packages to v19.03.8
Mar 30, 2020
d851b00
vendors: update fsouza/go-docker-client to v.1.6.3
Mar 30, 2020
ae75164
vendor: github.com/containerd/continuity pkgs
Mar 30, 2020
a5e16de
Fix docker/docker compile issue
Mar 30, 2020
2def8de
driver/docker: fix memory swapping
Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions drivers/docker/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ func (d *Driver) createContainerConfig(task *drivers.TaskConfig, driverConfig *T
StorageOpt: driverConfig.StorageOpt,
VolumeDriver: driverConfig.VolumeDriver,

PidsLimit: driverConfig.PidsLimit,
PidsLimit: &driverConfig.PidsLimit,
}

if _, ok := task.DeviceEnv[nvidiaVisibleDevices]; ok {
Expand Down Expand Up @@ -748,9 +748,14 @@ func (d *Driver) createContainerConfig(task *drivers.TaskConfig, driverConfig *T
// Windows does not support MemorySwap/MemorySwappiness #2193
if runtime.GOOS == "windows" {
hostConfig.MemorySwap = 0
hostConfig.MemorySwappiness = -1
hostConfig.MemorySwappiness = nil
} else {
hostConfig.MemorySwap = task.Resources.LinuxResources.MemoryLimitBytes // MemorySwap is memory + swap.

// disable swap explicitly in non-Windows environments
var swapiness int64 = 0
hostConfig.MemorySwappiness = &swapiness

}

loggingDriver := driverConfig.Logging.Type
Expand Down
191 changes: 191 additions & 0 deletions vendor/github.com/containerd/continuity/LICENSE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

176 changes: 176 additions & 0 deletions vendor/github.com/containerd/continuity/fs/copy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.