Skip to content

Commit 91c3e56

Browse files
rickmarkvidplace7
authored andcommitted
DevContainers: Include meshtasticd dependencies (meshtastic#5699)
* Include meshtasticd dependencies * Remove device-ui checkin * Add trunk rules matching other Dockerfiles --------- Co-authored-by: vidplace7 <vidplace7@gmail.com>
1 parent 2ae5300 commit 91c3e56

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.devcontainer/Dockerfile

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
# trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue
2+
# trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions
3+
# trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
14
FROM mcr.microsoft.com/devcontainers/cpp:1-debian-12
25

36
USER root
47

5-
# trunk-ignore(terrascan/AC_DOCKER_0002): Known terrascan issue
6-
# trunk-ignore(hadolint/DL3008): Use latest version of packages
78
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
89
&& apt-get -y install --no-install-recommends \
910
ca-certificates \
@@ -27,9 +28,11 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
2728
hwdata \
2829
gpg \
2930
gnupg2 \
31+
libusb-1.0-0-dev \
32+
libi2c-dev \
3033
&& apt-get clean && rm -rf /var/lib/apt/lists/*
3134

32-
RUN pipx install platformio==6.1.15
35+
RUN pipx install platformio
3336

3437
COPY 99-platformio-udev.rules /etc/udev/rules.d/99-platformio-udev.rules
3538

bin/build-native.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ mkdir -p $OUTDIR/
2424
rm -r $OUTDIR/* || true
2525

2626
# Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
27-
platformio pkg update --environment native || platformioFailed
27+
pio pkg update --environment native || platformioFailed
2828
pio run --environment native || platformioFailed
2929
cp .pio/build/native/program "$OUTDIR/meshtasticd_linux_$(uname -m)"
3030
cp bin/native-install.* $OUTDIR

0 commit comments

Comments
 (0)