fixing issues with etc.hosts files

Signed-off-by: Vanessa Sochat <[email protected]>

Author: vsoch

MANIFEST.in

@@ -0,0 +1,8 @@
+include README.md LICENSE
+recursive-include scompose *
+global-exclude *.py[co]
+recursive-exclude .git *
+global-exclude *.img
+global-exclude *.simg
+global-exclude *.sif
+global-exclude __pycache__

scompose/project/instance.py

@@ -18,11 +18,18 @@
 '''
 
 from scompose.logger import bot
-from scompose.utils import get_userhome
+from scompose.utils import (
+    get_userhome, 
+    read_file,
+    write_file
+)
 from spython.main import get_client
+from scompose.templates import get_template
+
 import shlex as _shlex
 import os
 import platform
+import re
 import sys
 
 
@@ -280,6 +287,42 @@ def stop(self):
             self.instance.stop(sudo=self.sudo)
             self.instance = None
 
+# Networking
+
+    def get_address(self):
+        '''get an ip address of an image. If it's busybox, we can't use 
+           hostname -I.
+        '''
+        ip_address = None
+
+        if self.sudo:
+            if self.exists():
+                result = self.client.execute(image=self.instance.get_uri(), 
+                                              command=['hostname', '-I'],
+                                              return_result=True,
+                                              quiet=True,
+                                              sudo=self.sudo)
+
+                # Busybox won't have hostname -I
+                if result['return_code'] != 0:
+                    cmd = "ip -4 --oneline address show up eth0"
+                    result = self.client.execute(image=self.instance.get_uri(), 
+                                                 command=cmd,
+                                                 return_result=True,
+                                                 quiet=True,
+                                                 sudo=self.sudo)
+
+                ip_address = result['message'].strip('\n').strip()
+
+                # Clean up busybox output
+                if "inet" in ip_address:
+                    ip_address = re.match('.+ inet (?P<address>.+)/', ip_address).groups()[0]
+        else:
+            ip_address = '127.0.1.1'
+
+        return ip_address
+
+
 # Logs
 
     def logs(self, tail=0):

scompose/project/project.py

@@ -163,12 +163,12 @@ def parse(self):
             for _, instance in self.instances.items():
                 instance.set_volumes_from(self.instances)
 
+
 # Networking
 
     def create_hosts(self, name, depends_on):
         '''create a hosts file to bind to all containers, where we define the
            correct hostnames to correspond with the ip addresses created.
-
            Note: This function is terrible. Singularity should easily expose 
                  these addresses. See issue here:
                  https://github.com/sylabs/singularity/issues/3751
@@ -179,34 +179,16 @@ def create_hosts(self, name, depends_on):
 
         for _, instance in self.instances.items():
            if instance.name in depends_on:   
-               if self.sudo:
-                   if instance.exists():
-                       result = self.client.execute(image=instance.instance.get_uri(), 
-                                                    command=['hostname', '-I'],
-                                                    return_result=True,
-                                                    quiet=True,
-                                                    sudo=self.sudo)
-
-                       # Busybox won't have hostname -I
-                       if result['return_code'] != 0:
-                           cmd = "ip -4 --oneline address show up eth0"
-                           result = self.client.execute(image=instance.instance.get_uri(), 
-                                                        command=cmd,
-                                                        return_result=True,
-                                                        quiet=True,
-                                                        sudo=self.sudo)
-
-                       ip_address = result['message'].strip('\n').strip()
-
-                       # Clean up busybox output
-                       if "inet" in ip_address:
-                           ip_address = re.match('.+ inet (?P<address>.+)/', ip_address).groups()[0]
-               else:
-                   ip_address = '127.0.1.1'
-
-               template = ['%s\t%s\n' % (ip_address, instance.name)] + template 
-               instance.volumes.append('%s:/etc/hosts' % hosts_basename)
-        write_file(hosts_file, template)
+               ip_address = instance.get_address()
+               if ip_address is not None:
+                   template = ['%s\t%s\n' % (ip_address, instance.name)] + template 
+        
+        # Add to our instance
+        instance = self.instances.get(name)
+
+        if instance:
+            instance.volumes.append('%s:/etc/hosts' % hosts_basename)
+            write_file(hosts_file, template)
 
 
 # Commands
@@ -218,7 +200,7 @@ def shell(self, name):
             if name in self.instances:
                 instance = self.instances[name]
                 if instance.exists():
-                    self.client.shell(instance.instance.get_uri())
+                    self.client.shell(instance.instance.get_uri(), sudo=self.sudo)
 
 
     def logs(self, names, tail=0):