[commit: ghc] wip/docker-ghcci: Let's try again (1edd30e)

[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/1edd30e301a11492438352cf88c8c32254322489/ghc

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

commit 1edd30e301a11492438352cf88c8c32254322489
Author: David Feuer <David.Feuer at gmail.com>
Date:   Mon Feb 26 23:51:34 2018 -0500

    Let's try again


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

1edd30e301a11492438352cf88c8c32254322489
 .circleci/images/x86_64-linux/Dockerfile | 2 ++
 .circleci/prepare-system.sh              | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/images/x86_64-linux/Dockerfile b/.circleci/images/x86_64-linux/Dockerfile
index c3219c9..bfc4a8c 100644
--- a/.circleci/images/x86_64-linux/Dockerfile
+++ b/.circleci/images/x86_64-linux/Dockerfile
@@ -6,4 +6,6 @@ RUN echo 'Install OpenSSH client'
 RUN apt-get update -qq
 RUN apt-get install -qy openssh-client
 
+RUN apt-get install -qy git make automake autoconf gcc perl python3 texinfo xz-utils lbzip2 patch
+
 USER ghc
diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh
index 193fac9..c61c09a 100755
--- a/.circleci/prepare-system.sh
+++ b/.circleci/prepare-system.sh
@@ -43,7 +43,6 @@ case "$(uname)" in
       fi
     else
       # assuming Ubuntu
-      apt-get install -qy git make automake autoconf gcc perl python3 texinfo xz-utils lbzip2 patch
       cabal update
       cabal install --reinstall hscolour --index-state=$hackage_index_state
     fi