aboutsummaryrefslogtreecommitdiff
path: root/static-linux
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-03-19 09:16:22 +0100
committerJohn MacFarlane <jgm@berkeley.edu>2017-03-19 09:16:22 +0100
commit86f400d57fa93b2c0b554d8512cbf79526f28d78 (patch)
tree70378f9c6b502e964f1dd140279709c2f1c43c6d /static-linux
parent87f99f3fdf0c372c2e5ded0112ff432aa0d7571f (diff)
downloadpandoc-86f400d57fa93b2c0b554d8512cbf79526f28d78.tar.gz
Improved static linux build.
Also build pandoc-citeproc. Put pandoc and pandoc-citeproc executables into a version-labeled tgz.
Diffstat (limited to 'static-linux')
-rw-r--r--static-linux/Dockerfile23
1 files changed, 17 insertions, 6 deletions
diff --git a/static-linux/Dockerfile b/static-linux/Dockerfile
index b0b169120..7c66f2029 100644
--- a/static-linux/Dockerfile
+++ b/static-linux/Dockerfile
@@ -1,12 +1,11 @@
# USE ALPINE LINUX
FROM alpine:edge
-RUN apk update
-# INSTALL BASIC DEV TOOLS, GHC, GMP & ZLIB
RUN echo "https://s3-us-west-2.amazonaws.com/alpine-ghc/8.0" >> /etc/apk/repositories
ADD https://raw.githubusercontent.com/mitchty/alpine-ghc/master/mitch.tishmack%40gmail.com-55881c97.rsa.pub \
/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
+RUN apk add alpine-sdk git ca-certificates ghc cabal stack zlib-dev \
+ dpkg fakeroot sed gawk grep
RUN stack update
RUN stack config set system-ghc --global true
RUN mkdir -p /etc/stack
@@ -16,6 +15,18 @@ WORKDIR /usr/src/
RUN git clone https://github.com/jgm/pandoc
WORKDIR /usr/src/pandoc
RUN stack install --local-bin-path /usr/bin hsb2hs
-RUN stack install --only-dependencies --flag 'pandoc:embed_data_files' --test --ghc-options '-O2 -optc-Os -optl-static -fPIC'
-CMD git pull
-CMD stack install --local-bin-path /artifacts --flag 'pandoc:embed_data_files' --test --ghc-options '-O2 -optc-Os -optl-static -fPIC'
+RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \
+ --flag 'pandoc:embed_data_files' \
+ --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \
+ pandoc pandoc-citeproc
+CMD git pull && \
+ export VERSION=`grep '^Version:' pandoc.cabal | awk '{print $$2;}'` && \
+ 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' \
+ pandoc pandoc-citeproc && \
+ cd /artifacts && \
+ mkdir pandoc-$VERSION && \
+ mv pandoc pandoc-citeproc pandoc-$VERSION/ && \
+ tar cvzf pandoc-$VERSION.tgz pandoc-$VERSION && \
+ rm -r pandoc-$VERSION