From 1c827f5512538617aad4b2d1c7faacb867dbad89 Mon Sep 17 00:00:00 2001 From: Rick Mark Date: Wed, 26 Feb 2025 21:01:34 -0800 Subject: [PATCH] DevContainers: Include meshtasticd dependencies (#5699) * Include meshtasticd dependencies * Remove device-ui checkin * Add trunk rules matching other Dockerfiles --------- Co-authored-by: vidplace7 --- .devcontainer/Dockerfile | 9 ++++++--- bin/build-native.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 62f0b7ead..d599f447f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,9 +1,10 @@ +# trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue +# trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions +# trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions FROM mcr.microsoft.com/devcontainers/cpp:1-debian-12 USER root -# trunk-ignore(terrascan/AC_DOCKER_0002): Known terrascan issue -# trunk-ignore(hadolint/DL3008): Use latest version of packages RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends \ ca-certificates \ @@ -27,9 +28,11 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ hwdata \ gpg \ gnupg2 \ + libusb-1.0-0-dev \ + libi2c-dev \ && apt-get clean && rm -rf /var/lib/apt/lists/* -RUN pipx install platformio==6.1.15 +RUN pipx install platformio COPY 99-platformio-udev.rules /etc/udev/rules.d/99-platformio-udev.rules diff --git a/bin/build-native.sh b/bin/build-native.sh index cda77b064..c6b1434dd 100755 --- a/bin/build-native.sh +++ b/bin/build-native.sh @@ -24,7 +24,7 @@ mkdir -p $OUTDIR/ rm -r $OUTDIR/* || true # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale -platformio pkg update --environment native || platformioFailed +pio pkg update --environment native || platformioFailed pio run --environment native || platformioFailed cp .pio/build/native/program "$OUTDIR/meshtasticd_linux_$(uname -m)" cp bin/native-install.* $OUTDIR