]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
dnsdist: Fix the location of the dnsdist-quiche library in our Docker image 15284/head
authorRemi Gacogne <remi.gacogne@powerdns.com>
Tue, 11 Mar 2025 14:04:28 +0000 (15:04 +0100)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Tue, 11 Mar 2025 14:04:28 +0000 (15:04 +0100)
Dockerfile-dnsdist

index 03cf2ca8b8ffe03f30e80a8e98d7dc22bcf7ccbe..4e474d21b8312596dee0ab62cedf57cd4cef00aa 100644 (file)
@@ -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 && \