From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 11 Mar 2025 14:04:28 +0000 (+0100)
Subject: dnsdist: Fix the location of the dnsdist-quiche library in our Docker image
X-Git-Tag: dnsdist-2.0.0-alpha1~16^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F15284%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: Fix the location of the dnsdist-quiche library in our Docker image
---

diff --git a/Dockerfile-dnsdist b/Dockerfile-dnsdist
index 03cf2ca8b8..4e474d21b8 100644
--- a/Dockerfile-dnsdist
+++ b/Dockerfile-dnsdist
@@ -65,9 +65,15 @@ RUN mkdir /build && \
       PKG_CONFIG_PATH=/opt/lib/pkgconfig && \
     make clean && \
     make $MAKEFLAGS install DESTDIR=/build && make clean && \
-    strip /build/usr/local/bin/* &&\
-    mkdir -p /build/usr/lib/ && \
-    cp -rf /usr/lib/libdnsdist-quiche.so /build/usr/lib/
+    strip /build/usr/local/bin/*
+
+RUN for tentative in "lib/x86_64-linux-gnu" "lib/aarch64-linux-gnu" "lib64" "lib"; do \
+      if [ -f "/usr/${tentative}/libdnsdist-quiche.so" ]; then \
+        mkdir -p "/build/usr/${tentative}/"; \
+        cp "/usr/${tentative}/libdnsdist-quiche.so" "/build/usr/${tentative}/"; \
+        break; \
+      fi; \
+    done
 
 RUN cd /tmp && mkdir /build/tmp/ && mkdir debian && \
     echo 'Source: docker-deps-for-pdns' > debian/control && \