From 40a55728bb5869aab38b1153adddef6db1995c74 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 27 Dec 2017 20:55:15 -0800 Subject: Docker build: upgrade stack first. --- linux/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'linux') diff --git a/linux/Dockerfile b/linux/Dockerfile index ddba77826..21c60338f 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -7,14 +7,16 @@ RUN apk update RUN apk add alpine-sdk git ca-certificates ghc cabal stack zlib-dev \ dpkg fakeroot sed gawk grep bash linux-headers RUN stack update -RUN stack config set system-ghc --global true +RUN stack upgrade +RUN $HOME/.local/bin/stack config set system-ghc --global true #RUN mkdir -p /etc/stack #RUN echo "build: { split-objs: true }" > /etc/stack/config.yaml RUN mkdir -p /usr/src/ WORKDIR /usr/src/ RUN git clone https://github.com/jgm/pandoc WORKDIR /usr/src/pandoc -RUN stack install --compiler 'ghc-8.0.2' --only-dependencies \ +RUN $HOME/.local/bin/stack install --compiler 'ghc-8.0.2' \ + --only-dependencies \ --flag 'pandoc:static' \ --flag 'pandoc:embed_data_files' \ --flag 'pandoc-citeproc:static' \ @@ -24,7 +26,7 @@ RUN stack install --compiler 'ghc-8.0.2' --only-dependencies \ pandoc pandoc-citeproc CMD git pull && \ git checkout -b work $TREE && \ - stack install --compiler 'ghc-8.0.2' \ + $HOME/.local/bin/stack install --compiler 'ghc-8.0.2' \ --flag 'pandoc:static' \ --flag 'pandoc:embed_data_files' \ --flag 'pandoc-citeproc:static' \ -- cgit v1.2.3