From ffa3d7160ead338a75f04167bc4931b8b55d608c Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 27 Dec 2017 20:21:37 -0800 Subject: Removed stack.pkg.yaml. We only really need stack.yaml; we can put flag settings for pandoc-citeproc there. Also use ghc-8.0.2 in dockerized linux build. This is the only version available for alpine so far. --- linux/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux') diff --git a/linux/Dockerfile b/linux/Dockerfile index 3660aa4fc..ddba77826 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -14,7 +14,7 @@ RUN mkdir -p /usr/src/ WORKDIR /usr/src/ RUN git clone https://github.com/jgm/pandoc WORKDIR /usr/src/pandoc -RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \ +RUN stack install --compiler 'ghc-8.0.2' --only-dependencies \ --flag 'pandoc:static' \ --flag 'pandoc:embed_data_files' \ --flag 'pandoc-citeproc:static' \ @@ -24,7 +24,7 @@ RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \ pandoc pandoc-citeproc CMD git pull && \ git checkout -b work $TREE && \ - stack install --stack-yaml stack.pkg.yaml \ + stack install --compiler 'ghc-8.0.2' \ --flag 'pandoc:static' \ --flag 'pandoc:embed_data_files' \ --flag 'pandoc-citeproc:static' \ -- cgit v1.2.3