Merge pull request #36 from ostafen/master

Format properly date/datetime labels

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,5 +1,5 @@
 #! /usr/bin/env python
-
+import datetime
 import sys, argparse, pyaml, docker
 from collections import OrderedDict
 
@@ -10,10 +10,12 @@ def main():
     args = parser.parse_args()
 
     struct = {}
-    networks = []
+    networks = {}
     for cname in args.cnames:
-        cfile, networks = generate(cname)
+        cfile, c_networks = generate(cname)
+
         struct.update(cfile)
+        networks.update(c_networks)
 
     render(struct, args, networks)
 
@@ -26,13 +28,27 @@ def render(struct, args, networks):
         pyaml.p(OrderedDict({'version': '"3"', 'services': struct, 'networks': networks}))
 
 
+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):
     c = docker.from_env()
 
     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
@@ -55,7 +71,7 @@ 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'],
@@ -91,15 +107,16 @@ def generate(cname):
         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']}
 
     # Check for command and add it if present.
-    if cattrs['Config']['Cmd'] != None:
+    if cattrs['Config']['Cmd'] is not None:
-        values['command'] = " ".join(cattrs['Config']['Cmd']),
+        values['command'] = cattrs['Config']['Cmd']
 
     # Check for exposed/bound ports and add them if needed.
     try:
-        expose_value =  list(cattrs['Config']['ExposedPorts'].keys())
+        expose_value = list(cattrs['Config']['ExposedPorts'].keys())
         ports_value = [cattrs['HostConfig']['PortBindings'][key][0]['HostIp']+':'+cattrs['HostConfig']['PortBindings'][key][0]['HostPort']+':'+key for key in cattrs['HostConfig']['PortBindings']]
 
         # If bound ports found, don't use the 'expose' value.