Skip to content

Commit

Permalink
Merge pull request #87 from pi-hole/ftl-build/idn2
Browse files Browse the repository at this point in the history
Add libidn2, remove libidn
  • Loading branch information
DL6ER authored Nov 20, 2023
2 parents ba04a5c + 33178ef commit c4420c3
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions ftl-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ ARG CONTAINER="alpine:edge"
FROM ${CONTAINER} AS builder

ARG TARGETPLATFORM
ARG idnversion=1.41
ARG readlineversion=8.1
ARG termcapversion=1.3.1
ARG nettleversion=3.9.1
Expand All @@ -28,6 +27,10 @@ RUN apk add --no-cache \
py3-yaml \
zip \
py3-requests \
libidn2-dev \
libidn2-static \
libunistring-dev \
libunistring-static \
perl

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

RUN curl -sSL https://ftl.pi-hole.net/libraries/libidn-${idnversion}.tar.gz | tar -xz \
&& cd libidn-${idnversion} \
&& ./configure --enable-static --disable-shared --disable-doc --disable-valgrind-tests \
&& make -j $(nproc) install \
&& cd .. \
&& rm -r libidn-${idnversion}

RUN curl -sSL https://ftl.pi-hole.net/libraries/termcap-${termcapversion}.tar.gz | tar -xz \
&& cd termcap-${termcapversion} \
&& ./configure --enable-static --disable-shared --disable-doc --without-examples \
Expand Down

0 comments on commit c4420c3

Please sign in to comment.