Merge remote-tracking branch 'remotes/origin/master'

ade25/fabfiles/__init__.py

@@ -1,2 +1,3 @@
 import project
 import server
+import docker

ade25/fabfiles/docker/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+"""Module providing docker support"""
+import compose

ade25/fabfiles/docker/compose.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+"""Module providing docker compose commands"""
+from fabric import api
+from fabric.api import task
+
+
+@task
+def build():
+    """ Build docker container """
+    build_dir = '{0}/build'.format(api.env.local_root)
+    configuration = '-f {0}/docker-compose.yml'.format(build_dir)
+    traefik = '-f {0}/docker-compose.traefik.yml'.format(build_dir)
+    with api.lcd(api.env.local_root):
+        api.local('docker-compose {0} {1} build'.format(
+            configuration, traefik)
+        )
+
+
+@task
+def run():
+    """ Run docker container """
+    build_dir = '{0}/build'.format(api.env.local_root)
+    configuration = '-f {0}/docker-compose.yml'.format(build_dir)
+    traefik = '-f {0}/docker-compose.traefik.yml'.format(build_dir)
+    with api.lcd(api.env.local_root):
+        api.local('docker-compose {0} {1} up'.format(
+            configuration, traefik)
+        )

ade25/fabfiles/project/db.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 """Module providing database management tasks"""
+from StringIO import StringIO
+from ConfigParser import SafeConfigParser
 from fabric.api import env
 from fabric.api import task
 from fabric.api import run
@@ -89,3 +91,17 @@ def get_secrets():
         local_dir="./secret.cfg",
         upload=False,
     )
+
+
+@task
+def show_secrets():
+    """Copy admin user to clipboard"""
+    path = '{0}/secret.cfg'.format(env.code_root)
+    fd = StringIO()
+    get(path, fd)
+    fd.seek(0)
+    config_parser = SafeConfigParser(allow_no_value=True)
+    config_parser.readfp(fd)
+    secret = config_parser.get('passwords', 'zope-admin')
+    local('echo "{0}" | pbcopy'.format(secret))
+    print('The admin secret is: {0}'.format(secret))

setup.py

@@ -23,7 +23,7 @@
       include_package_data=True,
       zip_safe=False,
       install_requires=[
-          'Fabric',
+          'Fabric==1.14.0',
           'cuisine',
           'setuptools',
           'slacker',