Bugfix(dockerfile): 🐛 curl8.6 require libpsl

qd-today · Feb 8, 2024 · 2a2c989 · 2a2c989
1 parent 1f4cf7e
commit 2a2c989
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,7 @@ RUN apk update && \
     apk add --update --no-cache --virtual .build_deps nano openssh-client \
     cmake make perl autoconf g++ automake linux-headers libtool util-linux file \
     libidn2-dev libgsasl-dev krb5-dev zstd-dev nghttp2-dev zlib-dev brotli-dev \
-    python3-dev py3-pip py3-setuptools py3-wheel c-ares-dev nghttp3-dev ngtcp2-dev && \
+    python3-dev py3-pip py3-setuptools py3-wheel c-ares-dev nghttp3-dev ngtcp2-dev libpsl-dev && \
     file /bin/busybox && \
     [[ $(getconf LONG_BIT) = "64" && -z $(file /bin/busybox | grep -i "arm") ]] && libdir="lib64" || libdir="lib" && \
     [[ $(getconf LONG_BIT) = "32" && -z $(file /bin/busybox | grep -i "arm") ]] && configtmp="setarch i386 ./config -m32" || configtmp="./config " && \
@@ -55,6 +55,6 @@ RUN apk update && \
     ln -s /usr/lib64/libcrypto.so.81.3 /usr/lib/ ;} || echo "" && \
     pip install --no-cache-dir --compile --break-system-packages pycurl && \
     apk del .build_deps && \
-    apk add --update --no-cache libidn2 libgsasl zlib c-ares nghttp2 nghttp3 ngtcp2 && \
+    apk add --update --no-cache libidn2 libgsasl zlib c-ares nghttp2 nghttp3 ngtcp2 libpsl && \
     rm -rf /var/cache/apk/* && \
     rm -rf /usr/share/man/*
diff --git a/Dockerfile.ja3 b/Dockerfile.ja3
@@ -16,7 +16,7 @@ RUN apk update && \
     apk add --update --no-cache --virtual .build_deps nano openssh-client \
     patch cargo cmake make perl autoconf g++ automake linux-headers libtool \
     util-linux file libidn2-dev libgsasl-dev krb5-dev zstd-dev nghttp2-dev zlib-dev \
-    python3-dev c-ares-dev go brotli-dev py3-pip py3-setuptools py3-wheel && \
+    python3-dev c-ares-dev go brotli-dev py3-pip py3-setuptools py3-wheel libpsl-dev && \
     wget https://curl.haxx.se/download/curl-$CURL_VERSION.tar.bz2 && \
     tar xjf curl-$CURL_VERSION.tar.bz2 && \
     rm curl-$CURL_VERSION.tar.bz2 && \
@@ -71,7 +71,7 @@ RUN apk update && \
     python3 setup.py install --openssl-dir=$PWD/../quiche/quiche/deps/boringssl/src && \
     cd / && \
     apk del .build_deps && \
-    apk add --update --no-cache libidn2 libgsasl zstd-libs zlib c-ares && \
+    apk add --update --no-cache libidn2 libgsasl zstd-libs zlib c-ares libpsl && \
     rm -rf /curl-$CURL_VERSION && \
     rm -rf /quiche && \
     rm -rf ~/.cargo && \

diff --git a/Dockerfile.lite b/Dockerfile.lite
@@ -14,7 +14,7 @@ ENV CURL_VERSION=8.6.0
 RUN apk update && \
     apk add --update --no-cache git tzdata ca-certificates python3 && \
     apk add --update --no-cache --virtual .build_deps nano openssh-client cmake make perl autoconf g++ automake linux-headers libtool util-linux \
-    file libidn2-dev libgsasl-dev krb5-dev zstd-dev nghttp2-dev zlib-dev brotli-dev py3-pip py3-setuptools py3-wheel python3-dev c-ares-dev nghttp3-dev ngtcp2-dev && \
+    file libidn2-dev libgsasl-dev krb5-dev zstd-dev nghttp2-dev zlib-dev brotli-dev py3-pip py3-setuptools py3-wheel python3-dev c-ares-dev nghttp3-dev ngtcp2-dev libpsl-dev && \
     file /bin/busybox && \
     [[ $(getconf LONG_BIT) = "64" && -z $(file /bin/busybox | grep -i "arm") ]] && libdir="lib64" || libdir="lib" && \
     [[ $(getconf LONG_BIT) = "32" && -z $(file /bin/busybox | grep -i "arm") ]] && configtmp="setarch i386 ./config -m32" || configtmp="./config " && \
@@ -53,6 +53,6 @@ RUN apk update && \
     ln -s /usr/lib64/libcrypto.so.81.3 /usr/lib/ ;} || echo "" && \
     pip install --no-cache-dir --compile --break-system-packages pycurl && \
     apk del .build_deps && \
-    apk add --update --no-cache libidn2 libgsasl zstd-libs zlib c-ares nghttp2 nghttp3 ngtcp2 && \
+    apk add --update --no-cache libidn2 libgsasl zstd-libs zlib c-ares nghttp2 nghttp3 ngtcp2 libpsl && \
     rm -rf /var/cache/apk/* && \
     rm -rf /usr/share/man/*