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.
This commit is contained in:
John MacFarlane
2017-12-27 20:21:37 -08:00
parent 4371b07cd1
commit ffa3d7160e
5 changed files with 12 additions and 21 deletions
+2 -2
View File
@@ -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' \