commit d7fafe60482afdd6bf076b9fcbf7602f1c8349d5
author Tony Mack <tony.mack@gmail.com> Sat Oct 31 19:06:58 2015 +0000
committer Tony Mack <tony.mack@gmail.com> Sat Oct 31 19:06:58 2015 +0000
tree 2ca73c76d5addf9911f5c3c2b42da75ca9a5f71b
parent 70b05dafb5c32139e607bdbc46a53eefe6870848

refactor and cleanup

containers/xos/Dockerfile

diff --git a/containers/xos/Dockerfile b/containers/xos/Dockerfile
index d8fc4ba..37bd55b 100644
--- a/containers/xos/Dockerfile
+++ b/containers/xos/Dockerfile
@@ -65,18 +65,17 @@
     pyyaml \
     requests
 
+ADD http://code.jquery.com/jquery-1.9.1.min.js /usr/local/lib/python2.7/dist-packages/suit/static/suit/js/
+
 # Install XOS
-RUN git clone git://github.com/open-cloud/xos.git /tmp/xos && mv /tmp/xos/xos /opt/
+RUN git clone git://github.com/open-cloud/xos.git /tmp/xos && \
+    mv /tmp/xos/xos /opt/ && \
+    chmod +x /opt/xos/scripts/opencloud && \
+    /opt/xos/scripts/opencloud genkeys
 
 # install Tosca engine
 RUN bash /opt/xos/tosca/install_tosca.sh
 
-# Initscript is broken in Ubuntu
-#ADD observer-initscript /etc/init.d/xosobserver
-
-RUN chmod +x /opt/xos/scripts/opencloud
-RUN /opt/xos/scripts/opencloud genkeys
-
 EXPOSE 8000
 
 # Set environment variables.