From bbf71b262e2c28394f25bf0bbb496f663870896e Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Wed, 9 Nov 2016 16:38:17 +0100 Subject: [PATCH] Move docker related features to a separate module --- admin/mailu/__init__.py | 3 --- admin/mailu/admin/views/base.py | 9 +-------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/admin/mailu/__init__.py b/admin/mailu/__init__.py index c352febd..9e33e065 100644 --- a/admin/mailu/__init__.py +++ b/admin/mailu/__init__.py @@ -51,9 +51,6 @@ scheduler = background.BackgroundScheduler() manager = flask_script.Manager(app) manager.add_command('db', flask_migrate.MigrateCommand) -# Connect to the Docker socket -dockercli = docker.Client(base_url=app.config['DOCKER_SOCKET']) - # Task scheduling if not app.debug or os.environ.get('WERKZEUG_RUN_MAIN') == 'true': scheduler.start() diff --git a/admin/mailu/admin/views/base.py b/admin/mailu/admin/views/base.py index 1c636ee7..5ae87bed 100644 --- a/admin/mailu/admin/views/base.py +++ b/admin/mailu/admin/views/base.py @@ -34,15 +34,8 @@ def logout(): @app.route('/services', methods=['GET']) @access.global_admin def services(): - containers = {} try: - all_containers = dockercli.containers(all=True) + containers = dockercli.get() except Exception as error: return flask.render_template('docker-error.html', error=error) - for brief in all_containers: - if brief['Image'].startswith('mailu/'): - container = dockercli.inspect_container(brief['Id']) - container['Image'] = dockercli.inspect_image(container['Image']) - name = container['Config']['Labels']['com.docker.compose.service'] - containers[name] = container return flask.render_template('services.html', containers=containers)