Merge branch 'release/v1.2.0'

BuildOnViction · Mar 18, 2019 · e1c04bb · e1c04bb
2 parents f5bb359 + 97a31ab
commit e1c04bb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/create_tomochain_masternode/__init__.py b/create_tomochain_masternode/__init__.py
@@ -1 +1 @@
-__version__ = '1.1.1'
+__version__ = '1.2.0'
diff --git a/create_tomochain_masternode/main.py b/create_tomochain_masternode/main.py
@@ -104,8 +104,12 @@ def ask() -> Dict[str, str]:
             exists=True,
             file_okay=False,
             resolve_path=True,
-        ) if answers["storage"] == 'host directory' else click.STRING
+        ) if answers['storage'] == 'host directory' else click.STRING
     )
+    if answers['storage'] == 'docker volume':
+        answers['external'] = str(click.confirm(
+            f'{bullet} The volume already exists',
+        ))
     answers['expose_rpc'] = click.confirm(
         f'{bullet} Expose RPC',
     )

diff --git a/create_tomochain_masternode/templates/compose.py b/create_tomochain_masternode/templates/compose.py
@@ -25,10 +25,11 @@
       - 8546:8546
       {%- endif %}
     restart: always
-
-{% if storage == "docker volume" -%}
+{% if storage == "docker volume" %}
 volumes:
   {{ data }}:
-{%- endif %}
-
+    {%- if external == "True" %}
+    external: true
+    {%- endif %}
+{% endif %}
 """
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "create-tomochain-masternode"
-version = "1.1.1"
+version = "1.2.0"
 description = "Set up a TomoChain masternode by running one command."
 readme = "README.md"
 license = "GPL-3.0+"

diff --git a/tests/test_create_tomochain_masternode.py b/tests/test_create_tomochain_masternode.py
@@ -14,7 +14,7 @@ def runner():
 
 
 def test_version():
-    assert __version__ == '1.1.1'
+    assert __version__ == '1.2.0'
 
 
 def test_produced_yml(runner):