Integration test improvements

- Fix the setup step (the process has changed now that we're using
  pytest)

- Skip tests that are unstable

- Make better use of build caching

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/Dockerfile b/Dockerfile
index 20152f5..f1b806b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,14 @@
 FROM python:2.7
 MAINTAINER Joffrey F <joffrey@docker.com>
-ADD . /home/docker-py
+
+RUN mkdir /home/docker-py
 WORKDIR /home/docker-py
+
+ADD requirements.txt /home/docker-py/requirements.txt
+RUN pip install -r requirements.txt
+
+ADD test-requirements.txt /home/docker-py/test-requirements.txt
 RUN pip install -r test-requirements.txt
+
+ADD . /home/docker-py
 RUN pip install .