From 2ee3f45247846dd727dda9d5fd83e9e8d37824ae Mon Sep 17 00:00:00 2001
From: ShahanaFarooqui <shahana.farooqui@gmail.com>
Date: Thu, 6 Nov 2025 15:22:03 -0800
Subject: [PATCH] docker: Install arch independent libraries separately

---
 Dockerfile | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 17afe8571..7764478f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -100,17 +100,20 @@ ENV LIGHTNINGD_VERSION=master
 
 RUN dpkg --add-architecture ${target_arch_dpkg}
 
-#TODO: python3-dev needs QEMU for post install scripts. find a workaround to not use QEMU
+# Install architecture-independent libraries
 RUN apt-get update && \
     apt-get install -qq -y --no-install-recommends \
-        pkg-config:${target_arch_dpkg} \
-        libffi-dev:${target_arch_dpkg} \
-        python3-dev:${target_arch_dpkg} \
-        libicu-dev:${target_arch_dpkg} \
-        zlib1g-dev:${target_arch_dpkg} \
-        libsqlite3-dev:${target_arch_dpkg} \
-        libpq-dev:${target_arch_dpkg} \
-        crossbuild-essential-${target_arch_dpkg}
+        python3-dev
+
+# Install target-arch libraries
+RUN apt-get install -qq -y --no-install-recommends \
+    pkg-config:${target_arch_dpkg} \
+    libffi-dev:${target_arch_dpkg} \
+    libicu-dev:${target_arch_dpkg} \
+    zlib1g-dev:${target_arch_dpkg} \
+    libsqlite3-dev:${target_arch_dpkg} \
+    libpq-dev:${target_arch_dpkg} \
+    crossbuild-essential-${target_arch_dpkg}
 
 ARG AR=${target_arch}-ar
 ARG AS=${target_arch}-as