commit 213a9a46a590191cf5aa3e43e64ffa6863ab9ca9
author Scott Baker <smbaker@gmail.com> Wed Feb 18 15:16:07 2015 -0800
committer Scott Baker <smbaker@gmail.com> Wed Feb 18 15:16:07 2015 -0800
tree ce64627aa6cfed16fa72d8a2c26d89f4bb9ae4d9
parent 97468b7d553edb23a94144fba7e9bf844b5eaaf4
parent d882d1225ea655ad879a45f27dc40b7a382cc244

Merge branch 'master' of github.com:open-cloud/xos

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 08f4f8d..3d22a33 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -105,7 +105,7 @@
 RUN cd /opt/xos; python ./manage.py makemigrations hpc
 RUN cd /opt/xos; python ./manage.py makemigrations requestrouter
 RUN cd /opt/xos; python ./manage.py makemigrations syndicate_storage
-RUN cd /opt/xos; python ./manage.py makemigrations servcomp
+#RUN cd /opt/xos; python ./manage.py makemigrations servcomp
 
 RUN /opt/xos/scripts/opencloud initdb