projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e522f02
)
17296: Avoid memory-limiting feature in tests.
author
Tom Clegg <tom@curii.com>
Tue, 25 May 2021 21:11:38 +0000
(17:11 -0400)
committer
Tom Clegg <tom@curii.com>
Tue, 25 May 2021 21:11:38 +0000
(17:11 -0400)
Tests should pass if the kernel feature is not enabled.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
lib/crunchrun/docker.go
patch
|
blob
|
history
diff --git
a/lib/crunchrun/docker.go
b/lib/crunchrun/docker.go
index 32c60e699a64d8a5c3b797946f5304d704cd51dd..a39b754b3d396e4c02c75a518d47940dab9212f7 100644
(file)
--- a/
lib/crunchrun/docker.go
+++ b/
lib/crunchrun/docker.go
@@
-85,7
+85,7
@@
func (e *dockerExecutor) Create(spec containerSpec) error {
for k, v := range spec.Env {
cfg.Env = append(cfg.Env, k+"="+v)
}
- if spec.RAM < minDockerRAM {
+ if spec.RAM
> 0 && spec.RAM
< minDockerRAM {
spec.RAM = minDockerRAM
}
hostCfg := dockercontainer.HostConfig{