From: Ben Sturmfels <ben@sturm.com.au>
Date: Mon, 16 Sep 2019 07:27:05 +0000 (+1000)
Subject: Reorder Python 2 Dockerfile to install dependencies together.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c3096e30d51ab112e2ac28a4dea0e994ac482aad;p=mediagoblin.git

Reorder Python 2 Dockerfile to install dependencies together.
---

diff --git a/Dockerfile-python2 b/Dockerfile-python2
index 8ab28c0d..849ca8ae 100644
--- 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"]