Skip to content

Commit f356e25

Browse files
committed
fix: Dockerfile
1 parent 9a03a15 commit f356e25

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ RUN set -eux; \
3939

4040
FROM haskell:slim AS build-adblock2privoxy
4141

42+
ARG ADBLOCK2PRIVOXY_RESOLVER=lts-21.25
43+
4244
SHELL ["/bin/bash", "-eo", "pipefail", "-c"]
4345

4446
WORKDIR /build
@@ -54,10 +56,11 @@ RUN set -eux; \
5456
# hadolint ignore=DL3003
5557
RUN set -eux; \
5658
git clone https://github.com/essandess/adblock2privoxy.git . --depth=1; \
59+
export STACK_ROOT=/usr/local/etc/.stack; \
5760
cd adblock2privoxy; \
58-
stack setup --install-ghc; \
59-
stack build --allow-newer; \
60-
stack install --allow-newer --local-bin-path /usr/local/bin; \
61+
stack setup --allow-different-user --resolver $ADBLOCK2PRIVOXY_RESOLVER; \
62+
stack build --allow-different-user --resolver $ADBLOCK2PRIVOXY_RESOLVER --allow-newer; \
63+
stack install --allow-different-user --local-bin-path /usr/local/bin --resolver $ADBLOCK2PRIVOXY_RESOLVER --allow-newer; \
6164
adblock2privoxy --version;
6265

6366

0 commit comments

Comments
 (0)