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 v1.6.3 #7416

Merged
merged 7 commits into from
Mar 23, 2020
Merged

vendor: fsouza/go-docker-client v1.6.3 #7416

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2770a0f
vendor: fsouza/go-docker-client v1.6.3
greut Mar 22, 2020
2385de8
fixup! vendor: fsouza/go-docker-client v1.6.3
greut Mar 22, 2020
460c09f
fixup! fixup! vendor: fsouza/go-docker-client v1.6.3
greut Mar 22, 2020
984ba41
vendor: upgrade some parts of docker
greut Mar 22, 2020
39076e0
docker: disable swap in Windows only
greut Mar 23, 2020
0236ada
vendor: docker/docker -> moby/moby
greut Mar 23, 2020
7356e70
govendor sync
greut Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 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 All @@ -745,10 +745,13 @@ func (d *Driver) createContainerConfig(task *drivers.TaskConfig, driverConfig *T
hostConfig.CPUQuota = int64(task.Resources.LinuxResources.PercentTicks*float64(driverConfig.CPUCFSPeriod)) * int64(numCores)
}

// disable swapiness
var swapiness int64 = 0
hostConfig.MemorySwappiness = &swapiness
greut marked this conversation as resolved.
Show resolved Hide resolved

// Windows does not support MemorySwap/MemorySwappiness #2193
if runtime.GOOS == "windows" {
hostConfig.MemorySwap = 0
hostConfig.MemorySwappiness = -1
} else {
hostConfig.MemorySwap = task.Resources.LinuxResources.MemoryLimitBytes // MemorySwap is memory + swap.
}
Expand Down
2 changes: 1 addition & 1 deletion jobspec/test-fixtures/basic.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ job "binstore-storagelocker" {
driver = "docker"

lifecycle {
hook = "prestart"
hook = "prestart"
sidecar = true
}

Expand Down
18 changes: 4 additions & 14 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.

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

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

Loading