diff options
Diffstat (limited to '.circleci/images/x86_64-linux-deb9/Dockerfile')
| -rw-r--r-- | .circleci/images/x86_64-linux-deb9/Dockerfile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.circleci/images/x86_64-linux-deb9/Dockerfile b/.circleci/images/x86_64-linux-deb9/Dockerfile index 5341abe6ef..15ae41a2e4 100644 --- a/.circleci/images/x86_64-linux-deb9/Dockerfile +++ b/.circleci/images/x86_64-linux-deb9/Dockerfile @@ -4,8 +4,9 @@ ENV LANG C.UTF-8 RUN apt-get update -qq; apt-get install -qy gnupg -RUN echo 'deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main' > /etc/apt/sources.list.d/ghc.list -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F6F88286 +# http://downloads.haskell.org/debian/ +RUN echo 'deb http://downloads.haskell.org/debian stretch main' > /etc/apt/sources.list.d/ghc.list +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA3CBA3FFE22B574 RUN apt-get update -qq # Core build utilities @@ -18,9 +19,9 @@ RUN apt-get install -qy zlib1g-dev libtinfo-dev libsqlite3-0 libsqlite3-dev \ RUN apt-get install -qy python3-sphinx texlive-xetex texlive-latex-extra # Basic Haskell toolchain -RUN apt-get install -qy cabal-install-2.2 ghc-8.4.2 +RUN apt-get install -qy cabal-install-2.4 ghc-8.4.4 -ENV PATH /home/ghc/.local/bin:/opt/cabal/2.2/bin:/opt/ghc/8.4.2/bin:$PATH +ENV PATH /home/ghc/.local/bin:/opt/cabal/2.4/bin:/opt/ghc/8.4.4/bin:$PATH # LLVM ENV LLVM_TARBALL http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz @@ -35,12 +36,11 @@ RUN curl $LLVM_TARBALL | tar -xJC ..; \ RUN adduser ghc --gecos "GHC builds" --disabled-password RUN echo "ghc ALL = NOPASSWD : ALL" > /etc/sudoers.d/ghc USER ghc +WORKDIR /home/ghc/ # Build Haskell tools -RUN cabal update && \ - cabal install hscolour happy alex +RUN cabal v2-update && \ + cabal v2-install hscolour happy alex ENV PATH /home/ghc/.cabal/bin:$PATH -WORKDIR /home/ghc/ - CMD ["bash"] |