[commit: ghc] wip/docker-ghcci: Attempt freebsd (ad9b64d)

[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/ad9b64d453307ae9958da993f831d6f4b4dede3e/ghc

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

commit ad9b64d453307ae9958da993f831d6f4b4dede3e
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Feb 27 04:25:03 2018 -0500

    Attempt freebsd


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

ad9b64d453307ae9958da993f831d6f4b4dede3e
 .circleci/config.yml                       | 10 +++++-----
 .circleci/images/x86_64-freebsd/Dockerfile | 17 +++++++++++++++--
 .circleci/prepare-system.sh                |  6 ------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5e14f52..571de55 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -92,7 +92,7 @@ jobs:
   "validate-x86_64-linux":
     resource_class: xlarge
     docker:
-      - image: dfeuer/ghcci:x86_64-linux-0.0.2
+      - image: dfeuer/ghcci:x86_64-linux-0.0.3
     environment:
       <<: *buildenv
     steps:
@@ -110,7 +110,7 @@ jobs:
   "validate-x86_64-freebsd":
     resource_class: xlarge
     docker:
-      - image: ghcci:x86_64-freebsd
+      - image: dfeuer/ghcci:x86_64-freebsd-0.0.1
     environment:
       TARGET: FreeBSD
       <<: *buildenv
@@ -150,7 +150,7 @@ jobs:
   "validate-hadrian-x86_64-linux":
     resource_class: xlarge
     docker:
-      - image: dfeuer/ghcci:x86_64-linux-0.0.2
+      - image: dfeuer/ghcci:x86_64-linux-0.0.3
     environment:
       <<: *buildenv
     steps:
@@ -165,7 +165,7 @@ jobs:
   "validate-x86_64-linux-unreg":
     resource_class: xlarge
     docker:
-      - image: dfeuer/ghcci:x86_64-linux-0.0.2
+      - image: dfeuer/ghcci:x86_64-linux-0.0.3
     environment:
       <<: *buildenv
     steps:
@@ -180,7 +180,7 @@ jobs:
   "validate-x86_64-linux-llvm":
     resource_class: xlarge
     docker:
-      - image: dfeuer/ghcci:x86_64-linux-0.0.2
+      - image: dfeuer/ghcci:x86_64-linux-0.0.3
     environment:
       <<: *buildenv
       BUILD_FLAVOUR: perf-llvm
diff --git a/.circleci/images/x86_64-freebsd/Dockerfile b/.circleci/images/x86_64-freebsd/Dockerfile
index 9c51cc0..1c9916d 100644
--- a/.circleci/images/x86_64-freebsd/Dockerfile
+++ b/.circleci/images/x86_64-freebsd/Dockerfile
@@ -1,6 +1,10 @@
 FROM ubuntu:16.04
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update -qq
+RUN apt-get install -y --no-install-recommends software-properties-common
+RUN add-apt-repository -y ppa:hvr/ghc
+RUN apt-get update -qq
+RUN apt-get install -y --no-install-recommends \
   autoconf \
   automake \
   bzip2 \
@@ -18,7 +22,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   software-properties-common \
   sudo \
   wget \
-  xz-utils
+  xz-utils \
+  ghc-8.0.2 \
+  cabal-install-1.24 \
+  alex \
+  happy \
+  ncurses-dev \
+  gcc \
+  texinfo \
+  lbzip2
 
+RUN ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour
 COPY build-toolchain.sh /tmp/
 RUN /tmp/build-toolchain.sh x86_64
diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh
index c61c09a..6365c29 100755
--- a/.circleci/prepare-system.sh
+++ b/.circleci/prepare-system.sh
@@ -25,14 +25,8 @@ case "$(uname)" in
     if [[ -n ${TARGET:-} ]]; then
       if [[ $TARGET = FreeBSD ]]; then
         # cross-compiling to FreeBSD
-        add-apt-repository -y ppa:hvr/ghc
-        apt-get update -qq
-        apt-get install -qy ghc-8.0.2 cabal-install-1.24 alex happy \
-                            ncurses-dev git make automake autoconf gcc perl \
-                            python3 texinfo xz-utils lbzip2 patch
         cabal update
         cabal install --reinstall hscolour --index-state=$hackage_index_state
-        ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour
 
         echo 'HADDOCK_DOCS = NO' >> mk/build.mk
         echo 'WERROR=' >> mk/build.mk