Skip to content

Commit 33178ef

Browse files
committed
Remove self-compiled libidn and, instead, use libidn2 as provided by Alpine itself
Signed-off-by: DL6ER <[email protected]>
1 parent ba04a5c commit 33178ef

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

ftl-build/Dockerfile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ ARG CONTAINER="alpine:edge"
22
FROM ${CONTAINER} AS builder
33

44
ARG TARGETPLATFORM
5-
ARG idnversion=1.41
65
ARG readlineversion=8.1
76
ARG termcapversion=1.3.1
87
ARG nettleversion=3.9.1
@@ -28,6 +27,10 @@ RUN apk add --no-cache \
2827
py3-yaml \
2928
zip \
3029
py3-requests \
30+
libidn2-dev \
31+
libidn2-static \
32+
libunistring-dev \
33+
libunistring-static \
3134
perl
3235

3336
# Install pdns from community repo
@@ -42,13 +45,6 @@ RUN echo "@community http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VER}/communi
4245
ENV STATIC true
4346
ENV TEST true
4447

45-
RUN curl -sSL https://ftl.pi-hole.net/libraries/libidn-${idnversion}.tar.gz | tar -xz \
46-
&& cd libidn-${idnversion} \
47-
&& ./configure --enable-static --disable-shared --disable-doc --disable-valgrind-tests \
48-
&& make -j $(nproc) install \
49-
&& cd .. \
50-
&& rm -r libidn-${idnversion}
51-
5248
RUN curl -sSL https://ftl.pi-hole.net/libraries/termcap-${termcapversion}.tar.gz | tar -xz \
5349
&& cd termcap-${termcapversion} \
5450
&& ./configure --enable-static --disable-shared --disable-doc --without-examples \

0 commit comments

Comments
 (0)