diff options
| author | Andrew Dunning <adunning@users.noreply.github.com> | 2017-09-08 07:06:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 07:06:50 +0100 |
| commit | 51bb7453e41e5e7e28a60cb22cb4f4d082b7fbdf (patch) | |
| tree | bbcd5f299fa513065e3bcb3f274f1b895a899301 /linux | |
| parent | 3654c4373a2f4db8d4ab771937ad318a6921ac37 (diff) | |
| parent | 732005456e2b28150943a5a4e11bca6e1566f309 (diff) | |
| download | pandoc-51bb7453e41e5e7e28a60cb22cb4f4d082b7fbdf.tar.gz | |
Merge branch 'master' into patch-1
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Dockerfile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linux/Dockerfile b/linux/Dockerfile index b725bbaa5..f75db2c89 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -5,7 +5,7 @@ ADD https://raw.githubusercontent.com/mitchty/alpine-ghc/master/mitch.tishmack%4 /etc/apk/keys/mitch.tishmack@gmail.com-55881c97.rsa.pub RUN apk update RUN apk add alpine-sdk git ca-certificates ghc cabal stack zlib-dev \ - dpkg fakeroot sed gawk grep + dpkg fakeroot sed gawk grep bash linux-headers RUN stack update RUN stack config set system-ghc --global true RUN mkdir -p /etc/stack @@ -16,13 +16,15 @@ RUN git clone https://github.com/jgm/pandoc WORKDIR /usr/src/pandoc RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \ --flag 'pandoc:embed_data_files' \ - --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \ + --ghc-options '-O2 -optc-Os -optl=-pthread -optl=-static -fPIC' \ pandoc pandoc-citeproc CMD git pull && \ git checkout -b work $TREE && \ stack install --stack-yaml stack.pkg.yaml \ - --local-bin-path /artifacts --flag 'pandoc:embed_data_files' \ - --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \ + --flag 'pandoc:static' \ + --flag 'pandoc:embed_data_files' \ + --ghc-options '-O2 -optc-Os -optl=-pthread -optl=-static -fPIC' \ + --local-bin-path /artifacts \ pandoc pandoc-citeproc && \ bash linux/make_deb.sh && \ bash linux/make_tarball.sh |