From 16fbe8524756013713365fc2a656833639c90ec2 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 28 Apr 2020 15:51:41 +1000 Subject: Fix dependencies and tests for clean Python 2 & 3 test runs under Docker. This change gives a clean test run in the Debian-based Python 2 and Python 3 docker images. --- Dockerfile-debian-python3-sqlite | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Dockerfile-debian-python3-sqlite') diff --git a/Dockerfile-debian-python3-sqlite b/Dockerfile-debian-python3-sqlite index ea0639f8..5c2c70d3 100644 --- a/Dockerfile-debian-python3-sqlite +++ b/Dockerfile-debian-python3-sqlite @@ -133,12 +133,20 @@ USER www-data # changed from the default - say you've enabled some plugins or switched # database type. So instead we're doing a git clone. We could potentially use # `git archive` but this still wouldn't account for the submodules. +# +# TODO: Figure out a docker-only way to do the build and run from our local +# version, so that local changes are immediately available to the running +# container. Not as easy as it sounds. We have this working with docker-compose, +# but still uses upstream MediaGoblin for the build. RUN git clone --depth=1 git://git.savannah.gnu.org/mediagoblin.git -b master . RUN ./bootstrap.sh RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure RUN make +# Run the tests. +RUN ./bin/python -m pytest ./mediagoblin/tests --boxed + # Only safe if being run on a clean git checkout. Otherwise you may have already # customised mediagoblin.ini to already install these. RUN echo '[[mediagoblin.media_types.audio]]' >> mediagoblin.ini -- cgit v1.2.3