Reorder Python 2 Dockerfile to install dependencies together.

diff --git a/Dockerfile-python2 b/Dockerfile-python2
index 8ab28c0da8703d4937ab6af4e62e02ac3bc2ddef..849ca8ae359636a015c34815466e9b8fe7434027 100644 (file)
--- a/Dockerfile-python2
+++ b/Dockerfile-python2
@@ -27,6 +27,7 @@ python-jsonschema \
 python-kombu \
 python-lxml \
 python-migrate  \
+python-mock \
 python-py \
 python-pytest \
 python-pytest-xdist \
@@ -97,13 +98,5 @@ RUN ./bin/gmg dbupdate
 RUN ./bin/gmg adduser --username admin --password a --email admin@example.com
 RUN ./bin/gmg makeadmin admin
 
-RUN ./bin/pip freeze
-
-USER root
-RUN apt-get install -y \
-curl \
-python-mock
-USER www-data
-
 # You can change this to /bin/bash if you'd prefer a shell.
 CMD ["./lazyserver.sh",  "--server-name=broadcast"]