From 9982d18c01a18b78aadf1201b302df0455b86a08 Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Wed, 21 Jun 2017 13:21:33 +0200
Subject: [PATCH] TT#17502 fix Dockerfile

* no need to have files twice
* djangorestframework==3.4 so we keep stable compatibility
  - fix small issue with Serializer classes for that version

Change-Id: Ib0f04def39b41adf8cc0a700fe096e405b620cb0
---
 repoapi/serializers.py  |  1 +
 requirements/common.txt |  2 +-
 t/Dockerfile            |  4 ++--
 t/common.txt            | 15 ---------------
 t/dev.txt               |  2 --
 t/test.txt              |  7 -------
 6 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 t/common.txt
 delete mode 100644 t/dev.txt
 delete mode 100644 t/test.txt

diff --git a/repoapi/serializers.py b/repoapi/serializers.py
index 96fec61..3702d16 100644
--- a/repoapi/serializers.py
+++ b/repoapi/serializers.py
@@ -21,3 +21,4 @@ class JenkinsBuildInfoSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:
         model = models.JenkinsBuildInfo
+        fields = '__all__'
diff --git a/requirements/common.txt b/requirements/common.txt
index 8b2e780..38a72f5 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -2,7 +2,7 @@ Django==1.9
 django-extensions
 yuicompressor
 django-assets
-djangorestframework
+djangorestframework==3.4
 django-rest-swagger
 markdown
 django-filter
diff --git a/t/Dockerfile b/t/Dockerfile
index 8c9e5cf..573ebe3 100644
--- a/t/Dockerfile
+++ b/t/Dockerfile
@@ -5,14 +5,14 @@ FROM docker.mgm.sipwise.com/sipwise-jessie:latest
 # is updated with the current date. It will force refresh of all
 # of the base images and things like `apt-get update` won't be using
 # old cached versions when the Dockerfile is built.
-ENV REFRESHED_AT 2016-08-04
+ENV REFRESHED_AT 2017-06-21
 
 RUN apt-get update
 RUN apt-get install --assume-yes python2.7 python2.7-dev \
 	python-distribute python-pip git screen
 
 # Get pip to download and install requirements:
-COPY dev.txt test.txt common.txt /tmp/
+ADD requirements/*.txt /tmp/
 RUN pip install -r /tmp/test.txt
 
 RUN echo './t/testrunner' >>/root/.bash_history
diff --git a/t/common.txt b/t/common.txt
deleted file mode 100644
index 8b2e780..0000000
--- a/t/common.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Django==1.9
-django-extensions
-yuicompressor
-django-assets
-djangorestframework
-django-rest-swagger
-markdown
-django-filter
-six
-webassets
-celery<4.0
-django-celery
-flower
-django-jsonify
-python-debian
diff --git a/t/dev.txt b/t/dev.txt
deleted file mode 100644
index fc64438..0000000
--- a/t/dev.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r test.txt
-Werkzeug
diff --git a/t/test.txt b/t/test.txt
deleted file mode 100644
index 302659e..0000000
--- a/t/test.txt
+++ /dev/null
@@ -1,7 +0,0 @@
--r common.txt
-django-jenkins==0.19
-flake8==2.6
-pep8
-pylint
-coverage
-mock