github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-21 19:39:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1520 from msteinert/swappiness

Browse Source 
Do not attempt to set memory.swappiness to zero
This commit is contained in:
Brad Rydzewski 2016-03-11 10:47:01 -08:00
commit 314b2bf797
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/engine.go
View File

@ -302,6 +302,7 @@ func (e *engine) runJob(c context.Context, r *Task, updater *updater, client doc
Env: e.envs, Env: e.envs,
HostConfig: dockerclient.HostConfig{ HostConfig: dockerclient.HostConfig{
Binds: []string{"/var/run/docker.sock:/var/run/docker.sock"}, Binds: []string{"/var/run/docker.sock:/var/run/docker.sock"},
MemorySwappiness: -1,
}, },
Volumes: map[string]struct{}{ Volumes: map[string]struct{}{
"/var/run/docker.sock": struct{}{}, "/var/run/docker.sock": struct{}{},
@ -411,6 +412,7 @@ func (e *engine) runJobNotify(r *Task, client dockerclient.Client) error {
Env: e.envs, Env: e.envs,
HostConfig: dockerclient.HostConfig{ HostConfig: dockerclient.HostConfig{
Binds: []string{"/var/run/docker.sock:/var/run/docker.sock"}, Binds: []string{"/var/run/docker.sock:/var/run/docker.sock"},
MemorySwappiness: -1,
}, },
Volumes: map[string]struct{}{ Volumes: map[string]struct{}{
"/var/run/docker.sock": struct{}{}, "/var/run/docker.sock": struct{}{},