From cccaf33e2d2976ed6b875ce195b57f770d3e9617 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 15 Jul 2018 20:25:54 -0700 Subject: linux/Dockerfile: simplify and use new ghc 8.4.3. --- linux/Dockerfile | 38 +++----------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) (limited to 'linux') 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' \ -- cgit v1.2.3 From bf56181204a6e5df919da24006ef8a58b595f76a Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 30 Jul 2018 10:28:39 -0700 Subject: Remove duplicate instruction (#4796) --- linux/Dockerfile | 1 - 1 file changed, 1 deletion(-) (limited to 'linux') diff --git a/linux/Dockerfile b/linux/Dockerfile index 9b4c03ece..e25ff3f1c 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -1,7 +1,6 @@ # USE ALPINE LINUX FROM alpine RUN apk update -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... -- cgit v1.2.3 From 5776e62edff7007d6915d6cfc3fbecf63177b62c Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 16 Sep 2018 13:53:43 -0700 Subject: Remove upx stuff from Dockerfile. --- linux/Dockerfile | 3 --- 1 file changed, 3 deletions(-) (limited to 'linux') diff --git a/linux/Dockerfile b/linux/Dockerfile index e25ff3f1c..f2f59e9c5 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -5,10 +5,7 @@ RUN apk add alpine-sdk git ca-certificates ghc gmp-dev zlib-dev bash dpkg fakero # 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 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 setup --resolver lts-12 -- cgit v1.2.3 From f9665d0f4a2fe9d6aed272ffb4c9b618593249d7 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 16 Sep 2018 13:55:13 -0700 Subject: Linux Dockerfile: try upgrading stack. --- linux/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'linux') diff --git a/linux/Dockerfile b/linux/Dockerfile index f2f59e9c5..314de3b01 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -9,6 +9,8 @@ ENV PATH="/usr/local/bin:${PATH}" RUN ulimit -n 4096 RUN stack config set system-ghc --global true RUN stack setup --resolver lts-12 +# Upgrade to latest stack... +RUN stack install stack RUN mkdir -p /usr/src/ WORKDIR /usr/src/ RUN git clone https://github.com/jgm/pandoc -- cgit v1.2.3 From 1cd03e30dfc5618993f9d663fae0e318d87282d2 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 16 Sep 2018 19:42:08 -0700 Subject: linux/Dockerfile: Use more recent (unofficial) stack. --- linux/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'linux') diff --git a/linux/Dockerfile b/linux/Dockerfile index 314de3b01..97d4058cd 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -3,14 +3,15 @@ FROM alpine 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' +# Note that 1.6.5 is the last one with an official static binary...we need +# a more recent version, so we use this unofficial one. +RUN curl -L https://github.com/nh2/stack/releases/download/v1.6.5/stack-1.7.1-x86_64-unofficial-fully-static-musl > /usr/local/bin/stack +#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' +RUN chmod +x /usr/local/bin/stack ENV PATH="/usr/local/bin:${PATH}" RUN ulimit -n 4096 RUN stack config set system-ghc --global true RUN stack setup --resolver lts-12 -# Upgrade to latest stack... -RUN stack install stack RUN mkdir -p /usr/src/ WORKDIR /usr/src/ RUN git clone https://github.com/jgm/pandoc -- cgit v1.2.3