abdullah/docker-autocompose
1
0
Fork 0
mirror of https://github.com/Red5d/docker-autocompose synced 2026-01-03 15:18:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix volumes missing in generated compose file (#41)

Browse Source 
* fix volume export based off of https://github.com/Red5d/docker-autocompose/issues/17#issuecomment-943041549

* remove unneeded space

* export volumes in addition to networks

* fix syntax error

* actuall fix syntax errors

Co-authored-by: Adam Doussan <acdoussan@Adams-MacBook-Pro.local>
This commit is contained in:
acdoussan
2022-08-13 15:31:05 -05:00
committed by GitHub
parent e19c4654af
commit 0c4ff4fb25
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
autocompose.py
View File

@@ -12,7 +12,7 @@ def list_container_names():
def main(): def main():
parser = argparse.ArgumentParser(description='Generate docker-compose yaml definition from running container.') 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('-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('-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.') parser.add_argument('cnames', nargs='*', type=str, help='The name of the container to process.')
args = parser.parse_args() args = parser.parse_args()
@@ -22,21 +22,23 @@ def main():
struct = {} struct = {}
networks = {} networks = {}
volumes = {}
for cname in container_names: for cname in container_names:
cfile, c_networks = generate(cname) cfile, c_networks, c_volumes = generate(cname)
struct.update(cfile) struct.update(cfile)
networks.update(c_networks) networks.update(c_networks)
volumes.update(c_volumes)
render(struct, args, networks) render(struct, args, networks, volumes)
def render(struct, args, networks): def render(struct, args, networks, volumes):
# Render yaml file # Render yaml file
if args.version == 1: if args.version == 1:
pyaml.p(OrderedDict(struct)) pyaml.p(OrderedDict(struct))
else: else:
pyaml.p(OrderedDict({'version': '"3"', 'services': struct, 'networks': networks})) pyaml.p(OrderedDict({'version': '"3"', 'services': struct, 'networks': networks, 'volumes': volumes}))
def is_date_or_time(s: str): def is_date_or_time(s: str):
@@ -121,6 +123,11 @@ def generate(cname):
networks[network.attrs['Name']] = {'external': (not network.attrs['Internal']), networks[network.attrs['Name']] = {'external': (not network.attrs['Internal']),
'name': network.attrs['Name']} 'name': network.attrs['Name']}
volumes = {}
for volume in values['volumes']:
volume_name = volume.split(':')[0]
volumes[volume_name] = {'external': True}
# Check for command and add it if present. # Check for command and add it if present.
if cattrs['Config']['Cmd'] is not None: if cattrs['Config']['Cmd'] is not None:
values['command'] = cattrs['Config']['Cmd'] values['command'] = cattrs['Config']['Cmd']
@@ -150,7 +157,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"): 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 ct[key] = value
return cfile, networks return cfile, networks, volumes
if __name__ == "__main__": if __name__ == "__main__":