[commit: packages/binary] master: Fixes for docker and cabal-install 2.4. (6bdae6c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/6bdae6c097875097eb5dbf1faf805b9ab601bf74

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

commit 6bdae6c097875097eb5dbf1faf805b9ab601bf74
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Sat Oct 6 15:26:52 2018 +0200

    Fixes for docker and cabal-install 2.4.


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

6bdae6c097875097eb5dbf1faf805b9ab601bf74
 docker-compose.yml       | 2 +-
 docker/Dockerfile.anyghc | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3c011b3..1c56761 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
   binary_ghc843:
     build:
       context: .
-      dockerfile: docker/Dockerfile.ghc843
+      dockerfile: docker/Dockerfile.anyghc
       args:
        - ghcver=8.4.3
     volumes:
diff --git a/docker/Dockerfile.anyghc b/docker/Dockerfile.anyghc
index d241ca7..54caeb5 100644
--- a/docker/Dockerfile.anyghc
+++ b/docker/Dockerfile.anyghc
@@ -74,24 +74,25 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com  --recv-keys BA3CBA3FFE22B574
 RUN echo "deb http://downloads.haskell.org/debian stretch main" > /etc/apt/sources.list.d/haskell.list
 
 ARG ghcver=8.4.3
+ARG cabalinstallver=2.4
 
-RUN apt update && apt install -y cabal-install-2.2
+RUN apt update && apt install -y cabal-install-$cabalinstallver
 RUN apt update && apt install -y ghc-$ghcver
 RUN apt update && apt-get install -y zlib1g-dev
 
 ENV PATH=/opt/ghc/bin:$PATH
 
-RUN cabal update
+RUN cabal new-update
 
 COPY . /workdir/copy
 
 WORKDIR /workdir/copy
 RUN sed -i.bak -e 's/name:\s*binary/name: binary-next/' binary.cabal
 RUN mv binary.cabal binary-next.cabal
-RUN cabal sdist
+RUN cabal new-sdist
 
 WORKDIR /workdir/builddir
-RUN tar xf /workdir/copy/dist/*.tar.gz -C /workdir/builddir
+RUN tar xf /workdir/copy/dist-newstyle/sdist/*.tar.gz -C /workdir/builddir
 RUN mv /workdir/builddir/binary-* /workdir/builddir/binary-next
 # generics-bench.cache.gz is not part of the binary distribution,
 # it's too large. It only lives in the git repo. Copy it manually.