plugins/driver: remove NodeResources from task Resources and use PercentTicks field for docker driver

This commit is contained in:
Nick Ethier
2018-11-16 11:08:53 -05:00
parent 37ed75502e
commit 3601e4241d
6 changed files with 255 additions and 269 deletions

View File

@@ -659,8 +659,8 @@ func (tr *TaskRunner) buildTaskConfig() *drivers.TaskConfig {
LinuxResources: &drivers.LinuxResources{
MemoryLimitBytes: int64(tr.Task().Resources.MemoryMB) * 1024 * 1024,
CPUShares: int64(tr.Task().Resources.CPU),
PercentTicks: float64(tr.task.Resources.CPU) / float64(tr.clientConfig.Node.Resources.CPU),
},
NodeResources: tr.clientConfig.Node.Resources,
},
Env: tr.envBuilder.Build().Map(),
User: tr.task.User,