From 74bf824eeba6ade7eb808576b321b729950d06cb Mon Sep 17 00:00:00 2001 From: Romain GERARD Date: Sat, 4 Jan 2020 22:52:12 +0100 Subject: [PATCH] Bump dockerfile Former-commit-id: 385a62d66ae710ca7c521ac8fc55b7c21730380f Former-commit-id: 23ddc898b03ea65daab52646bf15f0cb8ace769d [formerly a75d6123c2676d026c119f58becb40fd24c3cd6e] [formerly d2fc2265d5d9f316b8b2e64a0efe4bfde94919c1 [formerly ade268386dfd252cbae9982a33449bc91aba7d27 [formerly ade268386dfd252cbae9982a33449bc91aba7d27 [formerly ade268386dfd252cbae9982a33449bc91aba7d27 [formerly 6ae72e372f44cb38dc4f0ade36ce2b2af896fec8]]]]] Former-commit-id: 2af7f7fb721ef3c080c8e52b149f685f57cc56a7 [formerly 4b4d29baafa47323e1f29fa8429942fd7e6d3e2a] Former-commit-id: 16062cea85f475a3e2aa55d89525a58e5e000dca Former-commit-id: 83606d3a274529b778d178916993ff5a3b66e59f Former-commit-id: 27ad74cc92ce756fabaccd59de888bc05bd73433 Former-commit-id: aed8546b1f5c8f266aaaf940118f0ed1296ef5b3 [formerly 74dcc5b1bf95ba306ff31b4bb3d945517e155677] Former-commit-id: 018ef1461154ce6c99b2234271c5f3ba56881541 --- Dockerfile.old | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile.old b/Dockerfile.old index 7fd1976..3c97149 100644 --- a/Dockerfile.old +++ b/Dockerfile.old @@ -1,7 +1,7 @@ -FROM alpine:3.9 as builder +FROM alpine:3.11 as builder MAINTAINER github@erebe.eu -RUN apk --no-cache add ca-certificates git ghc curl musl-dev gmp-dev zlib-dev pcre-dev xz make upx +RUN apk --no-cache add ca-certificates git ghc curl musl-dev gmp-dev zlib-dev zlib-static pcre-dev xz make upx RUN curl -sSL https://github.com/commercialhaskell/stack/releases/download/v2.1.3/stack-2.1.3-linux-x86_64-static.tar.gz | tar xvz && \ mv stack*/stack /usr/bin @@ -12,13 +12,13 @@ WORKDIR /mnt RUN rm -rf ~/.stack && \ stack config set system-ghc --global true && \ stack setup && \ - stack install --split-objs --ghc-options="-fPIC -fllvm" --only-dependencies + stack install --split-objs --ghc-options="-fPIC" --only-dependencies COPY . /mnt RUN echo ' ld-options: -static' >> wstunnel.cabal ; \ - stack install --split-objs --ghc-options="-fPIC -fllvm" -RUN upx --ultra-brute /root/.local/bin/wstunnel + stack install --split-objs --ghc-options="-fPIC" +#RUN upx /root/.local/bin/wstunnel