From 0f7ff140fc04e58f5e92b110b2f01a058cf134e9 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Mon, 14 Sep 2020 07:58:23 +0200 Subject: [PATCH] docker: Simplify the Dockerfile a little We can pass arguments to the entrypoint from the `docker run` commandline, so we do not need to do that via an environment variable. This way, we're an environment variable and an `eval` shorter. Signed-off-by: Gergely Nagy --- bin/run-docker | 3 +-- etc/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/run-docker b/bin/run-docker index 4a63d6f1..84cfbb38 100755 --- a/bin/run-docker +++ b/bin/run-docker @@ -16,5 +16,4 @@ docker build -t kaleidoscope/docker etc docker run --rm -it \ -v "${BOARD_HARDWARE_PATH}/keyboardio:/kaleidoscope/hardware/keyboardio" \ -v "$(pwd):/kaleidoscope/hardware/keyboardio/avr/libraries/Kaleidoscope" \ - -e DOCKER_COMMAND="$*" \ - kaleidoscope/docker + kaleidoscope/docker -c "$*" diff --git a/etc/Dockerfile b/etc/Dockerfile index 64aa8681..6b286b55 100644 --- a/etc/Dockerfile +++ b/etc/Dockerfile @@ -17,4 +17,4 @@ 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 ["/bin/bash", "-c", "eval \"${DOCKER_COMMAND}\""] +ENTRYPOINT ["/bin/bash"]