Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add libunwind into the container #82

Closed
wants to merge 3 commits into from
Closed

Add libunwind into the container #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7aa131
Add libunwind into the container
DL6ER Oct 9, 2023
62c703c
Use libunwind provided by alpine instead
DL6ER Oct 9, 2023
2d13a56
Add liblzma (xz) as dependency of libunwind
DL6ER Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ftl-build/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG CONTAINER="alpine:edge"
FROM ${CONTAINER} AS builder
ARG TARGETPLATFORM

ARG idnversion=1.41
ARG readlineversion=8.1
Expand Down Expand Up @@ -27,6 +28,9 @@ RUN apk add --no-cache \
py3-yaml \
zip \
py3-requests \
libunwind-static \
libunwind-dev \
xz-static \
perl

# Install pdns from community repo
Expand Down
9 changes: 9 additions & 0 deletions ftl-build/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ARG readlineversion=8.1
ARG termcapversion=1.3.1
ARG nettleversion=3.9.1
ARG mbedtlsversion=3.4.1
ARG libunwindversion=1.6.2

# Switch repositories to the archive server
RUN if [ "${CONTAINER}" = "debian:stretch-slim" ]; then \
Expand Down Expand Up @@ -87,6 +88,14 @@ RUN curl -sSL https://ftl.pi-hole.net/libraries/mbedtls-${mbedtlsversion}.tar.gz
&& cd .. \
&& rm -rf mbedtls-${mbedtlsversion}

# Build static libunwind
RUN curl -sSL https://ftl.pi-hole.net/libraries/libunwind-${libunwindversion}.tar.gz | tar -xz \
&& cd libunwind-${libunwindversion} \
&& ./configure --enable-static --disable-shared --disable-tests --disable-documentation \
&& make -j $(nproc) install \
&& cd .. \
&& rm -rf libunwind-${libunwindversion}

# Install bats-core directly into the build image
RUN git clone https://github.com/bats-core/bats-core.git

Expand Down
Loading