commit 178a2f1414a6e06adf8d122642227a2d2b6b36fa
author Tony Mack <tmack@cs.princeton.edu> Tue Oct 27 15:07:43 2015 -0400
committer Tony Mack <tmack@cs.princeton.edu> Tue Oct 27 15:07:58 2015 -0400
tree 29a5e0160f9ed72ff22066acd99fe1a2cbbe6443
parent 5d4f23578a8ac588bed57140e38c0362c41dd1d8

cleanup

xos/configurations/opencloud/Dockerfile

diff --git a/xos/configurations/opencloud/Dockerfile b/xos/configurations/opencloud/Dockerfile
index 5a4db61..ad11e6c 100644
--- a/xos/configurations/opencloud/Dockerfile
+++ b/xos/configurations/opencloud/Dockerfile
@@ -22,6 +22,7 @@
     libxslt1.1 \
     libxslt1-dev \
     libyaml-dev \
+    m4 \
     nginx \
     openssh-client \
     python-dev \
@@ -64,6 +65,7 @@
     django-ipware \
     django-encrypted-fields \
     django_rest_swagger \
+    python-dateutil \
     python-keyczar \
     pygraphviz \
     dnslib \
@@ -116,7 +118,8 @@
 RUN mkdir /etc/ssl/private-copy; mv /etc/ssl/private/* /etc/ssl/private-copy/; rm -r /etc/ssl/private; mv /etc/ssl/private-copy /etc/ssl/private; chmod -R 0700 /etc/ssl/private; chown -R postgres /etc/ssl/private
 
 # Set postgres password to match default value in settings.py
-RUN service postgresql start; sudo -u postgres psql -c "alter user postgres with password 'password';"
+RUN service postgresql start
+RUN sudo -u postgres psql -c "alter user postgres with password 'password';"
 
 # Turn DEBUG on so that devel server will serve static files
 #    (not necessary if --insecure is passed to 'manage.py runserver')
@@ -127,8 +130,6 @@
 
 
 # install Tosca engine
-RUN apt-get install -y m4
-RUN pip install python-dateutil
 RUN bash /opt/xos/tosca/install_tosca.sh
 
 # configure nginx