diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2017-12-27 20:21:37 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-12-27 20:21:37 -0800 |
| commit | ffa3d7160ead338a75f04167bc4931b8b55d608c (patch) | |
| tree | 2e9777432c8f1fe6a45d2b7b53ccbd5905dc7654 /linux | |
| parent | 4371b07cd103863d8a0ec06fa4ecf78ad5eb3a27 (diff) | |
| download | pandoc-ffa3d7160ead338a75f04167bc4931b8b55d608c.tar.gz | |
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.
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
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' \ |