From a3e69c159370d049744649945a3df6779f1556c2 Mon Sep 17 00:00:00 2001 From: acuadros95 Date: Mon, 18 Jul 2022 14:46:59 +0200 Subject: [PATCH] Use dos2unix to fix windows scripts format Signed-off-by: acuadros95 --- micro-ROS-static-library-builder/Dockerfile | 2 +- micro-ROS-static-library-builder/entrypoint.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/micro-ROS-static-library-builder/Dockerfile b/micro-ROS-static-library-builder/Dockerfile index 4a82108..69a1c5a 100755 --- a/micro-ROS-static-library-builder/Dockerfile +++ b/micro-ROS-static-library-builder/Dockerfile @@ -3,7 +3,7 @@ FROM ros:rolling RUN mkdir -p uros_ws WORKDIR uros_ws RUN apt update \ - && apt install -y wget \ + && apt install -y wget dos2unix \ && rm -rf log/ build/ src/* \ && rm -rf /var/lib/apt/lists/* \ && wget --no-check-certificate https://launchpad.net/gcc-arm-embedded/5.0/5-2016-q2-update/+download/gcc-arm-none-eabi-5_4-2016q2-20160622-linux.tar.bz2 \ diff --git a/micro-ROS-static-library-builder/entrypoint.sh b/micro-ROS-static-library-builder/entrypoint.sh index ce464ab..ce28e31 100755 --- a/micro-ROS-static-library-builder/entrypoint.sh +++ b/micro-ROS-static-library-builder/entrypoint.sh @@ -6,4 +6,9 @@ then export MICROROS_LIBRARY_FOLDER=microros_static_library fi -exec /project/$MICROROS_LIBRARY_FOLDER/library_generation/library_generation.sh "$@" \ No newline at end of file +GENERATION_SCRIPT=/project/$MICROROS_LIBRARY_FOLDER/library_generation/library_generation.sh + +# Convert bash script docker to unix for Windows users +dos2unix $GENERATION_SCRIPT + +exec $GENERATION_SCRIPT "$@" \ No newline at end of file