From 0e9f1beb4055264d585c5cabf36c757b6f0929e6 Mon Sep 17 00:00:00 2001
From: Jared Quinn <jared@jaredquinn.info>
Date: Sun, 7 Apr 2024 02:32:15 +1100
Subject: [PATCH] Native Linux Build (ARM support and webserver deps) (#3506)

* Added webserver libraries to build libs

* Revert "Added webserver libraries to build libs"

This reverts commit bcc72a06b9e1d26f57f46089ab96f502703bff3c.

* Added piwebserver library dependencies to native build

* Add webserver libraries to apt install for native build

* Revert additional libraries added by mistake

* Address trunk check issues on Dockerfile

* Ignore linter checks for pinning build packages and apt-get

---------

Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 Dockerfile                   | 52 +++++++++++++++++++++++-------------
 arch/portduino/portduino.ini |  2 +-
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 21e42ad87..76aa3e2a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim AS builder
+FROM debian:bookworm-slim AS builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
@@ -11,31 +11,45 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Install build deps
 USER root
-RUN apt-get update && \
-	apt-get -y install wget python3 g++ zip python3-venv git vim ca-certificates libgpiod-dev libyaml-cpp-dev libbluetooth-dev
 
-# create a non-priveleged user & group
+# trunk-ignore(terrascan/AC_DOCKER_0002): Known terrascan issue
+# trunk-ignore(hadolint/DL3008): Use latest version of packages for buildchain
+RUN apt-get update && apt-get install --no-install-recommends -y wget python3 python3-pip python3-wheel python3-venv g++ zip git \
+                           ca-certificates libgpiod-dev libyaml-cpp-dev libbluetooth-dev \
+                           libulfius-dev liborcania-dev libssl-dev pkg-config && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
 RUN groupadd -g 1000 mesh && useradd -ml -u 1000 -g 1000 mesh
-
 USER mesh
-RUN wget https://raw.githubusercontent.com/platformio/platformio-core-installer/master/get-platformio.py -qO /tmp/get-platformio.py && \
-	chmod +x /tmp/get-platformio.py && \
-	python3 /tmp/get-platformio.py && \
-	git clone https://github.com/meshtastic/firmware --recurse-submodules /tmp/firmware && \
-	cd /tmp/firmware && \
-	chmod +x /tmp/firmware/bin/build-native.sh && \
-	source ~/.platformio/penv/bin/activate && \
-	./bin/build-native.sh
 
-FROM frolvlad/alpine-glibc:glibc-2.31
+WORKDIR /tmp/firmware
+RUN python3 -m venv /tmp/firmware 
+RUN source ./bin/activate && pip3 install --no-cache-dir -U platformio==6.1.14
 
-RUN apk --update add --no-cache g++ shadow && \
-	groupadd -g 1000 mesh && useradd -ml -u 1000 -g 1000 mesh
+COPY . /tmp/firmware
+RUN source ./bin/activate && chmod +x /tmp/firmware/bin/build-native.sh && ./bin/build-native.sh
+RUN cp "/tmp/firmware/release/meshtasticd_linux_$(uname -m)" "/tmp/firmware/release/meshtasticd"
 
-COPY --from=builder /tmp/firmware/release/meshtasticd_linux_x86_64 /home/mesh/
 
+##### PRODUCTION BUILD #############
+
+FROM debian:bookworm-slim
+ENV DEBIAN_FRONTEND=noninteractive
+ENV TZ=Etc/UTC
+
+# trunk-ignore(terrascan/AC_DOCKER_0002): Known terrascan issue
+# trunk-ignore(hadolint/DL3008): Use latest version of packages for buildchain
+RUN apt-get update && apt-get --no-install-recommends -y install libc-bin libc6 libgpiod2 libyaml-cpp0.7 libulfius2.7 liborcania2.3 libssl3 && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+RUN groupadd -g 1000 mesh && useradd -ml -u 1000 -g 1000 mesh
 USER mesh
+
 WORKDIR /home/mesh
-CMD sh -cx "./meshtasticd_linux_x86_64 --hwid '${HWID:-$RANDOM}'"
+COPY --from=builder /tmp/firmware/release/meshtasticd /home/mesh/
 
-HEALTHCHECK NONE
\ No newline at end of file
+VOLUME /home/mesh/data
+
+CMD [ "sh",  "-cx", "./meshtasticd -d /home/mesh/data --hwid=${HWID:-$RANDOM}" ]
+
+HEALTHCHECK NONE
diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 077a49b3f..3c996741c 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -34,4 +34,4 @@ build_flags =
   -DPORTDUINO_LINUX_HARDWARE
   -lbluetooth
   -lgpiod
-  -lyaml-cpp
\ No newline at end of file
+  -lyaml-cpp