[commit: ghc] wip/docker-ghcci: Move apt-get up so we have root (b15742e)

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

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

commit b15742e71d0e2b4a285507e3bfe513ad9e737c6d
Author: David Feuer <David.Feuer at gmail.com>
Date:   Mon Feb 26 19:00:44 2018 -0500

    Move apt-get up so we have root


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

b15742e71d0e2b4a285507e3bfe513ad9e737c6d
 .circleci/config.yml                     | 19 ++++---------------
 .circleci/images/x86_64-linux/Dockerfile |  6 ++++++
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bc318c6..5e14f52 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,12 +7,6 @@ aliases:
   # Make sure we have proper openssh before checkout: CircleCI git
   # does not check the repository out properly without it and also
   # takes 20 times longer than it should be.
-  - &precheckout
-    run:
-      name: Install OpenSSH client
-      command: |
-        apt-get update -qq
-        apt-get install -qy openssh-client
   - &prepare
     run:
       name: prepare-system
@@ -98,11 +92,10 @@ jobs:
   "validate-x86_64-linux":
     resource_class: xlarge
     docker:
-      - image: dfeuer/ghcci:x86_64-linux-0.0.1
+      - image: dfeuer/ghcci:x86_64-linux-0.0.2
     environment:
       <<: *buildenv
     steps:
-      - *precheckout
       - checkout
       - *prepare
       - *submodules
@@ -122,7 +115,6 @@ jobs:
       TARGET: FreeBSD
       <<: *buildenv
     steps:
-      - *precheckout
       - checkout
       - *prepare
       - *submodules
@@ -158,11 +150,10 @@ jobs:
   "validate-hadrian-x86_64-linux":
     resource_class: xlarge
     docker:
-      - image: dfeuer/ghcci:x86_64-linux-0.0.1
+      - image: dfeuer/ghcci:x86_64-linux-0.0.2
     environment:
       <<: *buildenv
     steps:
-      - *precheckout
       - checkout
       - *prepare
       - *submodules
@@ -174,11 +165,10 @@ jobs:
   "validate-x86_64-linux-unreg":
     resource_class: xlarge
     docker:
-      - image: dfeuer/ghcci:x86_64-linux-0.0.1
+      - image: dfeuer/ghcci:x86_64-linux-0.0.2
     environment:
       <<: *buildenv
     steps:
-      - *precheckout
       - checkout
       - *prepare
       - *submodules
@@ -190,7 +180,7 @@ jobs:
   "validate-x86_64-linux-llvm":
     resource_class: xlarge
     docker:
-      - image: dfeuer/ghcci:x86_64-linux-0.0.1
+      - image: dfeuer/ghcci:x86_64-linux-0.0.2
     environment:
       <<: *buildenv
       BUILD_FLAVOUR: perf-llvm
@@ -206,7 +196,6 @@ jobs:
       - run:
           name: Verify that llc works
           command: llc
-      - *precheckout
       - checkout
       - *prepare
       - *submodules
diff --git a/.circleci/images/x86_64-linux/Dockerfile b/.circleci/images/x86_64-linux/Dockerfile
index aa8813f..c3219c9 100644
--- a/.circleci/images/x86_64-linux/Dockerfile
+++ b/.circleci/images/x86_64-linux/Dockerfile
@@ -1,3 +1,9 @@
 FROM haskell:8.2
+RUN echo 'Set up ghc user'
 RUN adduser ghc --gecos 'GHC builds' --disabled-password
+
+RUN echo 'Install OpenSSH client'
+RUN apt-get update -qq
+RUN apt-get install -qy openssh-client
+
 USER ghc