From 41bad3d172ffdc681fdbf5c151b8f23a37c2cd0b Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 24 Oct 2020 20:20:06 -0700 Subject: [PATCH] Do a better job priming the arduino env in docker --- etc/Dockerfile | 4 +++- etc/docker-entrypoint.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/Dockerfile b/etc/Dockerfile index 718125be..13f3cfb4 100644 --- a/etc/Dockerfile +++ b/etc/Dockerfile @@ -10,7 +10,9 @@ RUN ccache --set-config=cache_dir=/kaleidoscope-persist/ccache/cache RUN curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | \ sh -RUN /bin/arduino-cli core install arduino:avr +RUN ARDUINO_DIRECTORIES_DATA=/arduino-cli/data /bin/arduino-cli config init +RUN ARDUINO_DIRECTORIES_DATA=/arduino-cli/data /bin/arduino-cli update +RUN ARDUINO_DIRECTORIES_DATA=/arduino-cli/data /bin/arduino-cli core install arduino:avr COPY docker-entrypoint.sh /usr/local/bin/entrypoint diff --git a/etc/docker-entrypoint.sh b/etc/docker-entrypoint.sh index 557b59db..baac3824 100755 --- a/etc/docker-entrypoint.sh +++ b/etc/docker-entrypoint.sh @@ -16,5 +16,5 @@ ln -s /kaleidoscope/hardware/keyboardio/virtual/libraries/Kaleidoscope \ /kaleidoscope/hardware/keyboardio/avr/libraries/Kaleidoscope cd /kaleidoscope/hardware/keyboardio/avr/libraries/Kaleidoscope - +export ARDUINO_DIRECTORIES_DATA=/arduino-cli/data /bin/bash -c "$*"