summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-12-27 20:55:15 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2017-12-27 20:55:15 -0800
commit40a55728bb5869aab38b1153adddef6db1995c74 (patch)
tree5d2c70a883e2fcba8682efc28b3f9607e935be5a
parentffa3d7160ead338a75f04167bc4931b8b55d608c (diff)
Docker build: upgrade stack first.
-rw-r--r--linux/Dockerfile8
1 files changed, 5 insertions, 3 deletions
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' \