Little improvements

- update README.md
- refactoring paver & docker file

1 files changed, 38 insertions, 8 deletions

diff --git a/pavement.py b/pavement.py
index 6a4673c..cf1a317 100644
--- a/pavement.py
+++ b/pavement.py
@@ -10,7 +10,7 @@ def test():
 
 
 @task
-def up_dev_server():
+def up_local_dev_server():
     """
     Requirements:
 
@@ -18,15 +18,45 @@ def up_dev_server():
     - [fig](fig.sh)
 
     """
-    sh('fig up -d')
-    sh('fig stop web')
-    sh('fig start web')
-    sh('fig run web ./manage.py migrate')
-    sh('fig run web ./manage.py createsuperuser --username=admin --email=admin@example.com --noinput')
-    sh('fig run web ./manage.py set_fake_passwords --password=admin')
-    print """Open http://DOCKER_HOST:9090/admin/\n username: admin\n password: admin"""
+    sh('fig up -d db')
+    sh('fig up -d web')
+    print """Open http://{DOCKER_HOST}:9090/admin/\n username: admin\n password: admin"""
 
 
 @task
 def deploy_dev():
     sh('ebs-deploy deploy -e omaha-server-dev', cwd='omaha_server')
+
+
+@task
+def collectstatic():
+    sh('./manage.py collectstatic --noinput', cwd='omaha_server')
+
+
+@task
+def migrate():
+    sh('./manage.py migrate --noinput', cwd='omaha_server')
+
+
+@task
+def create_admin():
+    sh('./createadmin.py', cwd='omaha_server')
+
+
+@task
+def docker_run():
+    migrate()
+    create_admin()
+    collectstatic()
+    sh('/usr/bin/supervisord')
+
+
+@task
+def docker_run_test():
+    sh('pip install -r requirements-test.txt --use-mirrors')
+    test()
+
+
+@task
+def run_test_in_docker():
+    sh('fig run --rm web paver docker_run_test')