From 40aaf8e82c1ce23d2dd181316a290d73f3b08ae5 Mon Sep 17 00:00:00 2001 From: Alexander Petrenz Date: Fri, 11 Mar 2022 08:59:47 +0100 Subject: [PATCH 1/2] fixed network retrieval --- autocompose.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autocompose.py b/autocompose.py index 7d78856..e66e55f 100644 --- a/autocompose.py +++ b/autocompose.py @@ -10,14 +10,14 @@ def main(): args = parser.parse_args() struct = {} - networks = set() + networks = {} for cname in args.cnames: cfile, c_networks = generate(cname) struct.update(cfile) networks.update(c_networks) - render(struct, args, list(networks)) + render(struct, args, networks) def render(struct, args, networks): From 1af6b49233190e880e743007ebbfa4a0043ce69b Mon Sep 17 00:00:00 2001 From: Alexander Petrenz Date: Fri, 11 Mar 2022 08:59:55 +0100 Subject: [PATCH 2/2] added name attribute to every retrieved network --- autocompose.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autocompose.py b/autocompose.py index e66e55f..6c92524 100644 --- a/autocompose.py +++ b/autocompose.py @@ -93,7 +93,8 @@ 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'] is not None: