From 3a5bc1a4b8e519cbf21bbb3f9f53a064bab42b37 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Mon, 5 Aug 2019 20:34:05 +0200 Subject: [PATCH] Use cabal 3.0 in Dockerfile This avoids the hack from f4169620d4a90d1c8660781c765dee3a56f63660 / #836 --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 40a6962f4..8bd11704b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,17 +10,17 @@ # Docker> # hackage-server run --static-dir=datafiles # -FROM ubuntu +FROM ubuntu:18.04 RUN apt-get update RUN apt-get install -y software-properties-common +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y unzip libicu-dev postfix zlib1g-dev libssl-dev + RUN apt-add-repository ppa:hvr/ghc RUN apt-get update -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y unzip libicu-dev postfix -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y ghc-8.2.2 cabal-install-2.4 +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y ghc-8.2.2 cabal-install-3.0 ENV PATH /opt/ghc/bin:$PATH RUN cabal v2-update -RUN apt-get install -y zlib1g-dev libssl-dev RUN mkdir /build WORKDIR /build ADD hackage-server.cabal cabal.project ./ @@ -38,7 +38,7 @@ RUN cabal v2-build # backup/restore errors (though they look harmless) # see https://github.com/haskell/hackage-server/issues/425 #RUN cabal v2-test -RUN cabal v2-install -j . +RUN cabal v2-install all # setup server runtime environment RUN mkdir /runtime