Skip to content

Commit

Permalink
fix requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan Onushkin committed Nov 19, 2015
1 parent 2699cf9 commit 6a8073d
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/*_*

Expand All @@ -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
Expand Down
25 changes: 25 additions & 0 deletions req-base.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 6758574e917cde2a9efd42f6cb1312f9819f04ff Mon Sep 17 00:00:00 2001
From: csakoda <[email protected]>
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

0 comments on commit 6a8073d

Please sign in to comment.