commit ca36547f39192fe62f81604801772df426187ca6
author Jakub Josef <jjosef@mirantis.com> Mon Aug 28 14:52:20 2017 +0000
committer Gerrit Code Review <gerrit2@b3fef64565ee> Mon Aug 28 14:52:20 2017 +0000
tree 3a7a8f322b2cf94eb0a23bcb0b546e8a5296b043
parent fe26cc77798342a098e2c05d763b88f25c6412aa
parent 48482c2a8b197199a94564c856502f17064fd11d

Merge "Add possibility to specify Compose file version"

README.rst

diff --git a/README.rst b/README.rst
index 6087c5a..1b2f875 100644
--- a/README.rst
+++ b/README.rst
@@ -135,6 +135,7 @@
             update: true
             environment:
               SOMEVAR: somevalue
+            version: "3.1"
             service:
               db:
                 image: postgres

docker/files/docker-compose.yml

diff --git a/docker/files/docker-compose.yml b/docker/files/docker-compose.yml
index fbe8b74..f120327 100644
--- a/docker/files/docker-compose.yml
+++ b/docker/files/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '{{ compose.version|default("3") }}'
 
 services:
   {%- for name, srv in service.iteritems() %}

tests/pillar/client_deploy.sls

diff --git a/tests/pillar/client_deploy.sls b/tests/pillar/client_deploy.sls
index 860531a..d6d56ea 100644
--- a/tests/pillar/client_deploy.sls
+++ b/tests/pillar/client_deploy.sls
@@ -6,6 +6,7 @@
         enabled: true
         environment:
           SOMEVAR: somevalue
+        version: 3.3
         service:
           db:
             image: postgres