Merge pull request #12 from singularityhub/fix/exec-non-sudo-network

Fix/exec non sudo network

Author: vsoch

CHANGELOG.md

@@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are:
 The versions coincide with releases on pypi.
 
 ## [0.0.x](https://github.com/singularityhub/singularity-compose/tree/master) (0.0.x)
+ - when not using sudo, need to set --network=none, and catching exec error (0.0.12)
  - pyaml version should be for newer kind, and still check for attribute (0.0.11)
  - alpha release with simple (single container) working example (0.0.1)
  - dummy release (0.0.0)

scompose/__init__.py

@@ -16,3 +16,4 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 '''
+from .version import __version__

scompose/project/instance.py

@@ -154,6 +154,11 @@ def _get_network_commands(self, ip_address=None):
            ensure they are bound correctly.
         '''
         ports = ['--net']
+
+        # If no sudo, isolates container network with a loopback interface.
+        if not self.sudo:
+            ports += ["--network", "none"]
+
         for pair in self.ports:
             ports += ['--network-args', '"portmap=%s/tcp"' % pair]
 

scompose/project/project.py

@@ -30,6 +30,7 @@
 import json
 import os
 import re
+import subprocess
 import sys
 
 
@@ -267,11 +268,14 @@ def execute(self, name, commands):
             if name in self.instances:
                 instance = self.instances[name]
                 if instance.exists():
-                    for line in self.client.execute(instance.instance.get_uri(), 
-                                                    command=commands,
-                                                    stream=True,
-                                                    sudo=self.sudo):
-                        print(line, end='')
+                    try:
+                        for line in self.client.execute(instance.instance.get_uri(), 
+                                                        command=commands,
+                                                        stream=True,
+                                                        sudo=self.sudo):
+                            print(line, end='')
+                    except subprocess.CalledProcessError:
+                        bot.exit('Command had non zero exit status.')
 
 # Logs
 

scompose/version.py

@@ -17,7 +17,7 @@
 
 '''
 
-__version__ = "0.0.11"
+__version__ = "0.0.12"
 AUTHOR = 'Vanessa Sochat'
 AUTHOR_EMAIL = '[email protected]'
 NAME = 'singularity-compose'