From 27021fae3629d35f5a6709288d13752beee7f106 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Sun, 7 Apr 2024 13:36:12 -0500 Subject: [PATCH 1/2] Update Dockerfile to remove sticky bit during build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 76aa3e2a1d..a9628f6f7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN python3 -m venv /tmp/firmware RUN source ./bin/activate && pip3 install --no-cache-dir -U platformio==6.1.14 COPY . /tmp/firmware -RUN source ./bin/activate && chmod +x /tmp/firmware/bin/build-native.sh && ./bin/build-native.sh +RUN source ./bin/activate && sudo chmod -t /tmp/firmware -R && 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" From dc30bfb1fb54dff842b381170eb61cdd0610c2c0 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Sun, 7 Apr 2024 13:44:47 -0500 Subject: [PATCH 2/2] no sudo? --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a9628f6f7e..a6176c32b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN python3 -m venv /tmp/firmware RUN source ./bin/activate && pip3 install --no-cache-dir -U platformio==6.1.14 COPY . /tmp/firmware -RUN source ./bin/activate && sudo chmod -t /tmp/firmware -R && chmod +x /tmp/firmware/bin/build-native.sh && ./bin/build-native.sh +RUN source ./bin/activate && chmod -t /tmp/firmware -R && 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"