From 6a8073d4ed7e9fb0cd4467240c4cd313214fafaa Mon Sep 17 00:00:00 2001
From: Ivan Onushkin <ionushkin@yotateam.com>
Date: Thu, 19 Nov 2015 21:29:40 +0300
Subject: [PATCH] fix requirements see more
 https://github.com/tildaslash/RatticWeb/pull/406 and
 https://github.com/csakoda/RatticWeb/commit/6758574e917cde2a9efd42f6cb1312f9819f04ff

---
 Dockerfile     |  4 +++-
 req-base.patch | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 req-base.patch

diff --git a/Dockerfile b/Dockerfile
index 89e70d3..f4e3250 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update &&  \
     DEBIAN_FRONTEND=noninteractive apt-get -y install unzip python python-pip \
     python-dev gcc libsqlite3-dev libcurl4-openssl-dev libldap2-dev \
     libsasl2-dev libxml2-dev libxslt-dev apache2 libapache2-mod-wsgi mysql-server \
-    supervisor libmysqlclient-dev && \
+    supervisor libmysqlclient-dev patch && \
     apt-get clean && \
     rm /var/lib/apt/lists/*_*
 
@@ -22,6 +22,8 @@ RUN ln -s ../../../srv/rattic/conf/local.cfg /opt/rattic/conf/local.cfg
 ADD ./rattic.conf /etc/apache2/sites-available/rattic
 RUN ln -s ../../../srv/apache.conf /etc/apache2/sites-enabled/rattic
 # Install dependencies 
+ADD ./req-base.patch /opt/rattic/req-base.patch
+RUN cd /opt/rattic/ && /usr/bin/patch < req-base.patch
 RUN cd /opt/rattic/ && pip install -r requirements-mysql.txt
 
 # Copy run script
diff --git a/req-base.patch b/req-base.patch
new file mode 100644
index 0000000..4d1171e
--- /dev/null
+++ b/req-base.patch
@@ -0,0 +1,25 @@
+From 6758574e917cde2a9efd42f6cb1312f9819f04ff Mon Sep 17 00:00:00 2001
+From: csakoda <cms235@gmail.com>
+Date: Thu, 22 Oct 2015 14:22:27 -0700
+Subject: [PATCH] Fix kombu and django-celery versions
+
+Kombu 3.0.26 and django-celery 3.1.16 are the last verisons that work with django 1.6 it seems
+---
+ requirements-base.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/requirements-base.txt b/requirements-base.txt
+index c95e859..93ba4f4 100644
+--- a/requirements-base.txt
++++ b/requirements-base.txt
+@@ -22,7 +22,8 @@ db_backup==0.1.3
+ boto==2.26.1
+ lxml==3.3.3
+ celery>=3.1,<3.2
+-django-celery>=3.1,<3.2
++django-celery>=3.1,<3.1.17
+ importlib
+ django-social-auth>=0.7.9
+ paramiko==1.15.2
++kombu==3.0.26
+