Merge pull request #2620 from dbonev/2607-ulimits-not-merged-in-extended-services

Ulimits are now merged into extended services
2016-01-13 21:05:38 +00:00 · 2016-01-13 21:05:38 +00:00 · 3aba5bb67e
commit 3aba5bb67e
parent d56f64c30a 2f07e2ac36
3 changed files with 48 additions and 8 deletions
--- a/tests/fixtures/extends/common-env-labels-ulimits.yml
+++ b/tests/fixtures/extends/common-env-labels-ulimits.yml
@ -0,0 +1,13 @@
+web:
+  extends:
+    file: common.yml
+    service: web
+  environment:
+    - FOO=2
+    - BAZ=3
+  labels: ['label=one']
+  ulimits:
+    nproc: 65535
+    memlock:
+        soft: 1024
+        hard: 2048