From 67adda68ff4b04156658288084cf22f2cab72794 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 5 Feb 2015 20:56:22 +0200
Subject: [PATCH] Install fixed cabal-install (avoid test streaming bug)

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2a90db9b..4fb4f838 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,11 +16,11 @@ RUN rm /tmp/debian-bootstrap.sh
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.20 ghc-7.8.4
 
-ENV PATH /opt/ghc/7.8.4/bin:/opt/cabal/1.20/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV PATH /home/stackage/.cabal/bin:/opt/ghc/7.8.4/bin:/opt/cabal/1.20/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN cabal update
 ADD . /tmp/stackage
-RUN cd /tmp/stackage && cabal install . hscolour
+RUN cd /tmp/stackage && cabal install . hscolour cabal-install --constraint "Cabal < 1.22"
 RUN cp $HOME/.cabal/bin/* /usr/local/bin
 RUN rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage