From 736d13bdd941b5ced62dd696b9b578d40bceb7b8 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Fri, 11 Sep 2020 22:04:30 +0200 Subject: [PATCH] wip: docker stuff Signed-off-by: Gergely Nagy --- bin/kaleidoscope-builder | 1 + test/Dockerfile | 3 ++- test/docker-entrypoint | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100755 test/docker-entrypoint diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index fddfccd7..5dbd8f8e 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -580,6 +580,7 @@ docker_simulator_tests() { docker run --rm -it \ -v "${BOARD_HARDWARE_PATH}/keyboardio:/kaleidoscope/hardware/keyboardio" \ -v "$(pwd):/kaleidoscope/hardware/keyboardio/avr/libraries/Kaleidoscope" \ + -e DOCKER_COMMAND="make run-simulator-tests" \ kaleidoscope/simulator } diff --git a/test/Dockerfile b/test/Dockerfile index 983d0c94..c297dd67 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -17,4 +17,5 @@ RUN /usr/local/bin/arduino-cli core install arduino:avr VOLUME ["/kaleidoscope/hardware/keyboardio"] ENV BOARD_HARDWARE_PATH "/kaleidoscope/hardware" WORKDIR /kaleidoscope/hardware/keyboardio/avr/libraries/Kaleidoscope -ENTRYPOINT ["make", "run-simulator-tests"] +COPY docker-entrypoint /kaleidoscope/entry-point +ENTRYPOINT ["/kaleidoscope/entry-point"] diff --git a/test/docker-entrypoint b/test/docker-entrypoint new file mode 100755 index 00000000..7c4fa048 --- /dev/null +++ b/test/docker-entrypoint @@ -0,0 +1,2 @@ +#! /bin/bash +eval "${DOCKER_COMMAND}"