aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Sturmfels <ben@sturm.com.au>2019-09-16 17:27:05 +1000
committerBen Sturmfels <ben@sturm.com.au>2019-09-16 17:27:05 +1000
commitc3096e30d51ab112e2ac28a4dea0e994ac482aad (patch)
tree4774b5aef2028400e93f63fed91972b4eccd14ef
parent63a92e3bbd7aa4dc205a43d3542e85dc4e4965db (diff)
downloadmediagoblin-c3096e30d51ab112e2ac28a4dea0e994ac482aad.tar.lz
mediagoblin-c3096e30d51ab112e2ac28a4dea0e994ac482aad.tar.xz
mediagoblin-c3096e30d51ab112e2ac28a4dea0e994ac482aad.zip
Reorder Python 2 Dockerfile to install dependencies together.
-rw-r--r--Dockerfile-python29
1 files changed, 1 insertions, 8 deletions
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"]