Merge pull request #83 from pi-hole/ftl-build/libbacktrace

Add libbacktrace into ftl-build container
pi-hole · Oct 11, 2023 · 7d18911 · 7d18911
2 parents b671edc + f710d89
commit 7d18911
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/ftl-build/alpine/Dockerfile b/ftl-build/alpine/Dockerfile
@@ -82,6 +82,14 @@ RUN curl -sSL https://ftl.pi-hole.net/libraries/mbedtls-${mbedtlsversion}.tar.gz
     && cd .. \
     && rm -r mbedtls-${mbedtlsversion}
 
+# Build static libbacktrace
+RUN git clone https://github.com/ianlancetaylor/libbacktrace.git \
+    && cd libbacktrace \
+    && ./configure --enable-static --disable-shared \
+    && make -j $(nproc) install \
+    && cd .. \
+    && rm -r libbacktrace
+
 # Install bats-core directly into the build image
 RUN git clone https://github.com/bats-core/bats-core.git
 

diff --git a/ftl-build/debian/Dockerfile b/ftl-build/debian/Dockerfile
@@ -87,6 +87,14 @@ RUN curl -sSL https://ftl.pi-hole.net/libraries/mbedtls-${mbedtlsversion}.tar.gz
     && cd .. \
     && rm -rf mbedtls-${mbedtlsversion}
 
+# Build static libbacktrace
+RUN git clone https://github.com/ianlancetaylor/libbacktrace.git \
+    && cd libbacktrace \
+    && ./configure --enable-static --disable-shared \
+    && make -j $(nproc) install \
+    && cd .. \
+    && rm -r libbacktrace
+
 # Install bats-core directly into the build image
 RUN git clone https://github.com/bats-core/bats-core.git