darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Do not attempt to set memory.swappiness to zero

Browse source 
This is the same issue solved here:

drone/drone-exec@94fd9ba10d

This issue was introduced by this commit:

b5dcfc4edd
This commit is contained in:
Michael Steinert 2016-03-11 09:24:00 -06:00
parent 08e790f921
commit 42f5395004
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{}{},