Merge pull request #195 from salopensource/fixpsycopg2

Add back in the missing dependencies

Dockerfile

@@ -32,11 +32,14 @@ RUN apt-get update && \
     supervisor \
     libffi-dev && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-COPY setup/requirements.txt /requirements.txt
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+    mkdir /tmp/setup
+COPY setup/requirements.txt /tmp/setup/requirements.txt
+COPY requirements.txt /tmp/requirements.txt
 RUN easy_install pip && \
-    pip install -r /requirements.txt && \
-    rm /requirements.txt && \
+    pip install -r /tmp/requirements.txt && \
+    rm /tmp/requirements.txt && \
+    rm -rf /tmp/setup && \
     update-rc.d -f postgresql remove && \
     update-rc.d -f nginx remove && \
     mkdir -p /home/app && \

requirements.txt

@@ -1,9 +1,4 @@
 -r setup/requirements.txt
-dj-database-url==0.3.0
-dj-static==0.0.5
-django-toolbelt==0.0.1
 gunicorn==19.6.0
 psycopg2==2.6.2
-pystache==0.5.4
-setproctitle=1.1.10
-static==1.0.2
+setproctitle==1.1.10

sal/version.plist

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>version</key>
-	<string>3.2.12.1116</string>
+	<string>3.2.13.1117</string>
 </dict>
 </plist>

set_build_no.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-current_version="3.2.12"
+current_version="3.2.13"
 pushd `dirname $0` > /dev/null
 SCRIPTPATH=`pwd`