diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2018-07-15 20:25:54 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2018-07-15 20:25:54 -0700 |
| commit | cccaf33e2d2976ed6b875ce195b57f770d3e9617 (patch) | |
| tree | 35f00ba096e3263b1abbfedac103b8c346fb1a9c /linux | |
| parent | 75cf1f59ff30115ce235edf5ca17abb903d78d6c (diff) | |
| download | pandoc-cccaf33e2d2976ed6b875ce195b57f770d3e9617.tar.gz | |
linux/Dockerfile: simplify and use new ghc 8.4.3.
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Dockerfile | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/linux/Dockerfile b/linux/Dockerfile index 6c7679c56..9b4c03ece 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -1,13 +1,10 @@ # USE ALPINE LINUX FROM alpine 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 gmp-dev zlib-dev bash dpkg fakeroot # GRAB A RECENT BINARY OF STACK +# Note that 1.6.5 is the last one with a static binary... RUN curl -L https://github.com/commercialhaskell/stack/releases/download/v1.6.5/stack-1.6.5-linux-x86_64-static.tar.gz | tar xz --wildcards --strip-components=1 -C /usr/local/bin '*/stack' # COMPRESS WITH UPX ADD https://github.com/lalyos/docker-upx/releases/download/v3.91/upx /usr/local/bin/upx @@ -15,43 +12,14 @@ ENV PATH="/usr/local/bin:${PATH}" RUN chmod 755 /usr/local/bin/upx RUN ulimit -n 4096 RUN stack config set system-ghc --global true -RUN stack --resolver lts-9 setup --install-cabal 2.0.1.1 -#RUN mkdir -p /etc/stack -#RUN echo "build: { split-objs: true }" > /etc/stack/config.yaml +RUN stack setup --resolver lts-12 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.lts9.yaml \ - --only-dependencies \ - --flag 'pandoc:static' \ - --flag 'pandoc:embed_data_files' \ - --flag 'pandoc-citeproc:static' \ - --flag 'pandoc-citeproc:embed_data_files' \ - --flag 'hslua:-export-dynamic' \ - --ghc-options '-O2 -optc-Os -optl=-pthread -optl=-static -fPIC' \ - aeson -RUN stack install --stack-yaml stack.lts9.yaml \ - --only-dependencies \ - --flag 'pandoc:static' \ - --flag 'pandoc:embed_data_files' \ - --flag 'pandoc-citeproc:static' \ - --flag 'pandoc-citeproc:embed_data_files' \ - --flag 'hslua:-export-dynamic' \ - --ghc-options '-O2 -optc-Os -optl=-pthread -optl=-static -fPIC' \ - http-client-tls -RUN stack install --stack-yaml stack.lts9.yaml \ - --only-dependencies \ - --flag 'pandoc:static' \ - --flag 'pandoc:embed_data_files' \ - --flag 'pandoc-citeproc:static' \ - --flag 'pandoc-citeproc:embed_data_files' \ - --flag 'hslua:-export-dynamic' \ - --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.lts9.yaml \ + stack install \ --flag 'pandoc:static' \ --flag 'pandoc:embed_data_files' \ --flag 'pandoc-citeproc:static' \ |