[commit: ghc] wip/docker-ghcci: Perm error (0d8c020)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/docker-ghcci
Link       : http://ghc.haskell.org/trac/ghc/changeset/0d8c020aba9ed5c817e553f0dbbb436245afa0e0/ghc

>---------------------------------------------------------------

commit 0d8c020aba9ed5c817e553f0dbbb436245afa0e0
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Feb 27 18:08:22 2018 -0500

    Perm error


>---------------------------------------------------------------

0d8c020aba9ed5c817e553f0dbbb436245afa0e0
 .circleci/config.yml                       | 8 ++++----
 .circleci/images/x86_64-freebsd/Dockerfile | 1 +
 .circleci/images/x86_64-linux/Dockerfile   | 2 ++
 .circleci/prepare-system.sh                | 1 -
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a26ef1c..8507e23 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -86,7 +86,7 @@ jobs:
   "validate-x86_64-linux":
     resource_class: xlarge
     docker:
-      - image: dfeuer/ghcci:x86_64-linux-0.0.3
+      - image: dfeuer/ghcci:x86_64-linux-0.0.4
     environment:
       <<: *buildenv
     steps:
@@ -144,7 +144,7 @@ jobs:
   "validate-hadrian-x86_64-linux":
     resource_class: xlarge
     docker:
-      - image: dfeuer/ghcci:x86_64-linux-0.0.3
+      - image: dfeuer/ghcci:x86_64-linux-0.0.4
     environment:
       <<: *buildenv
     steps:
@@ -158,7 +158,7 @@ jobs:
   "validate-x86_64-linux-unreg":
     resource_class: xlarge
     docker:
-      - image: dfeuer/ghcci:x86_64-linux-0.0.3
+      - image: dfeuer/ghcci:x86_64-linux-0.0.4
     environment:
       <<: *buildenv
     steps:
@@ -173,7 +173,7 @@ jobs:
   "validate-x86_64-linux-llvm":
     resource_class: xlarge
     docker:
-      - image: dfeuer/ghcci:x86_64-linux-0.0.3
+      - image: dfeuer/ghcci:x86_64-linux-0.0.4
     environment:
       <<: *buildenv
       BUILD_FLAVOUR: perf-llvm
diff --git a/.circleci/images/x86_64-freebsd/Dockerfile b/.circleci/images/x86_64-freebsd/Dockerfile
index 5ab8f58..9a661c1 100644
--- a/.circleci/images/x86_64-freebsd/Dockerfile
+++ b/.circleci/images/x86_64-freebsd/Dockerfile
@@ -34,3 +34,4 @@ RUN apt-get install -y --no-install-recommends \
 
 COPY build-toolchain.sh /tmp/
 RUN /tmp/build-toolchain.sh x86_64
+RUN ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour
diff --git a/.circleci/images/x86_64-linux/Dockerfile b/.circleci/images/x86_64-linux/Dockerfile
index bfc4a8c..4630ba2 100644
--- a/.circleci/images/x86_64-linux/Dockerfile
+++ b/.circleci/images/x86_64-linux/Dockerfile
@@ -8,4 +8,6 @@ RUN apt-get install -qy openssh-client
 
 RUN apt-get install -qy git make automake autoconf gcc perl python3 texinfo xz-utils lbzip2 patch
 
+RUN ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour
+
 USER ghc
diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh
index 47fbcb1..506df63 100755
--- a/.circleci/prepare-system.sh
+++ b/.circleci/prepare-system.sh
@@ -24,7 +24,6 @@ case "$(uname)" in
   Linux)
     cabal update
     cabal install --reinstall hscolour --index-state=$hackage_index_state
-    ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour
 
     if [[ -n ${TARGET:-} ]]; then
       if [[ $TARGET = FreeBSD ]]; then