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
changes/36/13936/4
Victor Seva 8 years ago
parent 45f81959e2
commit 9982d18c01

@ -21,3 +21,4 @@ class JenkinsBuildInfoSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
model = models.JenkinsBuildInfo
fields = '__all__'

@ -2,7 +2,7 @@ Django==1.9
django-extensions
yuicompressor
django-assets
djangorestframework
djangorestframework==3.4
django-rest-swagger
markdown
django-filter

@ -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

@ -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

@ -1,2 +0,0 @@
-r test.txt
Werkzeug

@ -1,7 +0,0 @@
-r common.txt
django-jenkins==0.19
flake8==2.6
pep8
pylint
coverage
mock
Loading…
Cancel
Save