better handling for default networks (#42)

* better handling for default networks

* fix for issues/43

* check for none explictly rather than allowing truthy/falsy conversion

* update to read volume data from mounts, rather than host config binds

Co-authored-by: Adam Doussan <acdoussan@Adams-MacBook-Pro.local>

README.md

@@ -43,3 +43,6 @@ Use the new image to generate a docker-compose file from a running container or
 
     docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/red5d/docker-autocompose <container-name-or-id> <additional-names-or-ids>...
 
+To print out all containers in a docker-compose format:
+
+    docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/red5d/docker-autocompose $(docker ps -aq)

autocompose.py

@@ -1,29 +1,74 @@
 #! /usr/bin/env python
-
+import datetime
 import sys, argparse, pyaml, docker
 from collections import OrderedDict
 
+
+def list_container_names():
+    c = docker.from_env()
+    return [container.name for container in c.containers.list(all=True)]
+
+
 def main():
     parser = argparse.ArgumentParser(description='Generate docker-compose yaml definition from running container.')
+    parser.add_argument('-a', '--all', action='store_true', help='Include all active containers')
     parser.add_argument('-v', '--version', type=int, default=3, help='Compose file version (1 or 3)')
     parser.add_argument('cnames', nargs='*', type=str, help='The name of the container to process.')
     args = parser.parse_args()
 
+    container_names = args.cnames
+    if args.all:
+        container_names.extend(list_container_names())
+
     struct = {}
-    networks = []
-    for cname in args.cnames:
-        cfile, networks = generate(cname)
+    networks = {}
+    volumes = {}
+    for cname in container_names:
+        cfile, c_networks, c_volumes = generate(cname)
+
         struct.update(cfile)
 
-    render(struct, args, networks)
+        if c_networks is None:
+            networks = None
+        else:
+            networks.update(c_networks)
+
+        if c_volumes is None:
+            volumes = None
+        else:
+            volumes.update(c_volumes)
+
+    render(struct, args, networks, volumes)
 
 
-def render(struct, args, networks):
+def render(struct, args, networks, volumes):
     # Render yaml file
     if args.version == 1:
         pyaml.p(OrderedDict(struct))
     else:
-        pyaml.p(OrderedDict({'version': '"3"', 'services': struct, 'networks': networks}))
+        ans = {'version': '"3"', 'services': struct}
+
+        if networks is not None:
+            ans['networks'] = networks
+
+        if volumes is not None:
+            ans['volumes'] = volumes
+
+        pyaml.p(OrderedDict(ans))
+
+
+def is_date_or_time(s: str):
+    for parse_func in [datetime.date.fromisoformat, datetime.datetime.fromisoformat]:
+        try:
+            parse_func(s.rstrip('Z'))
+            return True
+        except ValueError:
+            pass
+    return False
+
+
+def fix_label(label: str):
+    return f"'{label}'" if is_date_or_time(label) else label
 
 
 def generate(cname):
@@ -32,7 +77,7 @@ def generate(cname):
     try:
         cid = [x.short_id for x in c.containers.list(all=True) if cname == x.name or x.short_id in cname][0]
     except IndexError:
-        print("That container is not available.")
+        print("That container is not available.", file=sys.stderr)
         sys.exit(1)
 
     cattrs = c.containers.get(cid).attrs
@@ -44,6 +89,8 @@ def generate(cname):
     cfile[cattrs['Name'][1:]] = {}
     ct = cfile[cattrs['Name'][1:]]
 
+    default_networks = ['bridge', 'host', 'none']
+
     values = {
         'cap_add': cattrs['HostConfig']['CapAdd'],
         'cap_drop': cattrs['HostConfig']['CapDrop'],
@@ -55,15 +102,15 @@ def generate(cname):
         'environment': cattrs['Config']['Env'],
         'extra_hosts': cattrs['HostConfig']['ExtraHosts'],
         'image': cattrs['Config']['Image'],
-        'labels': cattrs['Config']['Labels'],
+        'labels': {label: fix_label(value) for label, value in cattrs['Config']['Labels'].items()},
         'links': cattrs['HostConfig']['Links'],
         #'log_driver': cattrs['HostConfig']['LogConfig']['Type'],
         #'log_opt': cattrs['HostConfig']['LogConfig']['Config'],
         'logging': {'driver': cattrs['HostConfig']['LogConfig']['Type'], 'options': cattrs['HostConfig']['LogConfig']['Config']},
-        'networks': {x for x in cattrs['NetworkSettings']['Networks'].keys() if x != 'bridge'},
+        'networks': {x for x in cattrs['NetworkSettings']['Networks'].keys() if x not in default_networks},
         'security_opt': cattrs['HostConfig']['SecurityOpt'],
         'ulimits': cattrs['HostConfig']['Ulimits'],
-        'volumes': cattrs['HostConfig']['Binds'],
+        'volumes': [f'{m["Name"]}:{m["Destination"]}' for m in cattrs['Mounts'] if m['Type'] == 'volume'],
         'volume_driver': cattrs['HostConfig']['VolumeDriver'],
         'volumes_from': cattrs['HostConfig']['VolumesFrom'],
         'entrypoint': cattrs['Config']['Entrypoint'],
@@ -87,15 +134,27 @@ def generate(cname):
     networks = {}
     if values['networks'] == set():
         del values['networks']
+        assumed_default_network = list(cattrs['NetworkSettings']['Networks'].keys())[0]
+        values['network_mode'] = assumed_default_network
+        networks = None
     else:
         networklist = c.networks.list()
         for network in networklist:
             if network.attrs['Name'] in values['networks']:
-                networks[network.attrs['Name']] = {'external': (not network.attrs['Internal'])}
+                networks[network.attrs['Name']] = {'external': (not network.attrs['Internal']),
+                                                   'name': network.attrs['Name']}
+
+    volumes = {}
+    if values['volumes'] is not None:
+        for volume in values['volumes']:
+            volume_name = volume.split(':')[0]
+            volumes[volume_name] = {'external': True}
+    else:
+        volumes = None
 
     # Check for command and add it if present.
-    if cattrs['Config']['Cmd'] != None:
-        values['command'] = " ".join(cattrs['Config']['Cmd']),
+    if cattrs['Config']['Cmd'] is not None:
+        values['command'] = cattrs['Config']['Cmd']
 
     # Check for exposed/bound ports and add them if needed.
     try:
@@ -122,7 +181,7 @@ def generate(cname):
         if (value != None) and (value != "") and (value != []) and (value != 'null') and (value != {}) and (value != "default") and (value != 0) and (value != ",") and (value != "no"):
             ct[key] = value
 
-    return cfile, networks
+    return cfile, networks, volumes
 
 
 if __name__ == "__main__":