need to stop, seems to be issue with docker firewalls

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

Author: vsoch

scompose/client/__init__.py

@@ -119,6 +119,10 @@ def get_parser():
                       dest='tail', type=int,
                       help='clip logs to certain number of lines from end')
 
+    logs.add_argument('--clear', dest="clear", 
+                      help="clear existing logs.", 
+                      default=False, action='store_true')
+
     ps = subparsers.add_parser("ps",
                                help="list instances")
 

scompose/client/logs.py

@@ -34,5 +34,7 @@ def main(args, parser, extra):
                       name=args.project_name,
                       env_file=args.env_file)
 
-    # Create instances, and if none specified, create all
-    project.logs(args.names, args.tail)
+    if args.clear:
+        project.clear_logs(args.names)
+    else:
+        project.logs(args.names, args.tail)

scompose/project/instance.py

@@ -290,18 +290,17 @@ def stop(self):
 # Networking
 
     def get_address(self):
-        '''get an ip address of an image. If it's busybox, we can't use 
+        '''get the bridge 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)
+                                             command=['hostname', '-I'],
+                                             return_result=True,
+                                             quiet=True,
+                                             sudo=self.sudo)
 
                 # Busybox won't have hostname -I
                 if result['return_code'] != 0:
@@ -313,8 +312,6 @@ def get_address(self):
                                                  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:
@@ -325,9 +322,29 @@ def get_address(self):
 
 # Logs
 
-    def logs(self, tail=0):
-        '''show logs for an instance'''
+    def clear_logs(self):
+        '''delete logs for an instance, if they exist.
+        '''
+        log_folder = self._get_log_folder()
+
+        for ext in ['out', 'err']:
+            logfile = os.path.join(log_folder, '%s.%s' % (self.name, ext.lower()))
+
+            # Use Try/catch to account for not existing.
+            try:
+                if not self.sudo:
+                    self.client._run_command(['rm', logfile], quiet=True)
+                    self.client._run_command(['touch', logfile], quiet=True)
+                else:
+                    self.client._run_command(['sudo', 'rm', logfile], quiet=True)
+                    self.client._run_command(['sudo', 'touch', logfile], quiet=True)
+            except:
+                pass
+
 
+    def _get_log_folder(self):
+        '''get a log folder that includes a user, home, and host
+        '''
         home = get_userhome()
         user = os.path.basename(home)
 
@@ -337,21 +354,21 @@ def logs(self, tail=0):
 
         # Hostname
         hostname = platform.node()
+        return os.path.join(home, '.singularity', 'instances', 'logs', hostname, user)
+
+
+    def logs(self, tail=0):
+        '''show logs for an instance'''
 
-        log_folder = os.path.join(home, '.singularity', 'instances', 'logs', hostname, user)
+        log_folder = self._get_log_folder()
 
         for ext in ['OUT', 'ERR']:
             logfile = os.path.join(log_folder, '%s.%s' % (self.name, ext.lower()))
 
             # Use Try/catch to account for not existing.
             try:
-                if not self.sudo:
-                    result = self.client._run_command(['cat', logfile], quiet=True)
-                else:
-                    result = self.client._run_command(['sudo', 'cat', logfile], quiet=True)
-
-                if result:
- 
+                result = self.client._run_command(['cat', logfile], quiet=True, sudo=self.sudo)
+                if result: 
                     # If the user only wants to see certain number
                     if tail > 0:
                         result = '\n'.join(result.split('\n')[-tail:])

scompose/project/project.py

@@ -166,30 +166,46 @@ def parse(self):
 
 # Networking
 
+    def get_bridge_address(self, name='sbr0'):
+        '''get the (named) bridge address on the host. It should be automatically
+           created by Singularity over 3.0.
+        '''
+        command = ["ip", "-4", "--oneline", "address", "show", "up", name]
+        result = self.client._run_command(command,
+                                          return_result=True,
+                                          quiet=True,
+                                          sudo=self.sudo)['message']
+        bridge_address = re.match('.+ inet (?P<address>.+)/', result).groups()[0]
+        return bridge_address
+
+
     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
+
+           Parameters
+           ==========
+           name: the name of the instance to create
+           depends_on: the other instances it depends on
         '''
         template = read_file(get_template('hosts'))
         hosts_file = os.path.join(self.working_dir, 'etc.hosts.%s' % name)
         hosts_basename = os.path.basename(hosts_file)        
 
+        # Add an entry for each instance hostname to see the others
         for _, instance in self.instances.items():
-           if instance.name in depends_on:   
-               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)
-
+            ip_address = instance.get_address()
+            if ip_address:
+                print(ip_address)
+                template = ['%s\t%s\n' % (ip_address, instance.name)] + template
+
+        # Add the host file to be mounted
+        write_file(hosts_file, template)
+        return hosts_file
+ 
 
 # Commands
 
@@ -225,18 +241,20 @@ def execute(self, name, commands):
                                                     sudo=self.sudo):
                         print(line, end='')
 
+# Logs
+
+    def clear_logs(self, names):
+        '''clear_logs will remove all old error and output logs.
+        '''
+        for instance in self.iter_instances(names):
+            instance.clear_logs()
+
 
     def logs(self, names, tail=0):
         '''logs will print logs to the screen.
         '''
-        # If no names provided, show all logs
-        if not names:
-            names = self.get_instance_names()
-
-        # Print logs for each
-        for name in names:
-            if name in self.instances:
-                self.instances[name].logs(tail=tail)
+        for instance in self.iter_instances(names):
+            instance.logs(tail=tail)
 
 # Config
 
@@ -273,7 +291,11 @@ def up(self, names, writable_tmpfs=False):
         '''
         return self._create(names, command="up", writable_tmpfs=writable_tmpfs)
 
-    def _create(self, names, command="create", writable_tmpfs=False):
+    def _create(self, 
+                names, 
+                command="create",
+                writable_tmpfs=True):
+
         '''create one or more instances. "Command" determines the sub function
            to call for the instance, which should be "create" or "up".
            If the user provide a list of names, use them, otherwise default
@@ -289,6 +311,8 @@ def _create(self, names, command="create", writable_tmpfs=False):
         if not names:
             names = self.get_instance_names()
 
+        writable_tmpfs = True
+
         # Keep a count to determine if we have circular dependency structure
         created = []
         count = 0
@@ -309,9 +333,11 @@ def _create(self, names, command="create", writable_tmpfs=False):
 
                 if do_create:
 
-                    # Create a hosts file for the instance based on depends
-                    self.create_hosts(instance.name, created)
+                    # Create a hosts file for the instance based, add as volume
+                    hosts_file = self.create_hosts(instance.name, depends_on)
+                    instance.volumes.append('%s:/etc/hosts' % hosts_file)
 
+                    print(instance.volumes)
                     # If we get here, execute command and add to list
                     getattr(instance, command)(self.working_dir, writable_tmpfs)
                     created.append(instance.name)