Merge pull request #161 from sensebox/fix/cache

Fix Cache

Author: Thiemann96

Dockerfile

@@ -45,6 +45,7 @@ RUN cp /tmp/OTAFiles/boards.txt /root/.arduino15/packages/esp32/hardware/esp32/$
     cp /tmp/OTAFiles/APOTA.bin /root/.arduino15/packages/esp32/hardware/esp32/${ESP32_VERSION}/variants/sensebox_mcu_esp32s2/ && \
     cp /tmp/OTAFiles/variant.cpp /root/.arduino15/packages/esp32/hardware/esp32/${ESP32_VERSION}/variants/sensebox_mcu_esp32s2/
 
+RUN rm -rf /tmp/OTAFiles
 
 # install Libraries with arduino-cli
 RUN arduino-cli lib install "Ethernet"

docker-compose.yml

@@ -1,30 +1,33 @@
-version: "2"
-
 services:
   compiler:
-    image: sensebox/sensebox-sketches
+    image: ghcr.io/sensebox/sensebox-sketches:main
     ports:
       - 3000:3000
     networks:
       - compiler-network
     volumes:
-      - build-cache:/app/src/build-cache
+      - build-cache:/root/.cache/arduino
       - sketch-cache:/tmp
 
+
   cleanup:
-    image: alpine:latest
-    command: |
-      /bin/sh -c "
-        set -e
-        IFS=$$'\n\t'
-        eval exec find /tmp/* -type d -maxdepth 0 -mmin +60 | xargs rm -rf
-      "
+    image: mcuadros/ofelia:latest
+    command: daemon --docker
     volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
       - sketch-cache:/tmp
+    labels:
+      ofelia.job-local.cleanup.schedule: "@daily"
+      ofelia.job-local.cleanup.command: |
+        /bin/sh -c "
+          set -e
+          IFS=$$'\n\t'
+          eval exec find /tmp/* -type d -maxdepth 0 -mmin +60 | xargs rm -rf
+        "
 
 networks:
   compiler-network:
 
 volumes:
   build-cache:
-  sketch-cache:
+  sketch-cache:

src/builder.js

@@ -19,8 +19,6 @@ export const boardBinaryFileextensions = {
   "sensebox-esp32s2": "bin",
 };
 
-const baseArgs = ["--build-cache-path", `/app/src/build-cache`];
-
 export const payloadValidator = function payloadValidator(req, res, next) {
   // reject all non application/json requests
   if (
@@ -85,10 +83,9 @@ const execBuilder = async function execBuilder({ board, sketch, buildDir }) {
 
   await spawn(`arduino-cli`, [
     "compile",
-    ...baseArgs,
     "--fqbn",
     boardFQBNs[board],
-    "--build-path",
+    "--output-dir",
     buildDir,
     sketchDir,
   ]);