Skip to content

Commit

Permalink
Dockerfile: Added dos2unix and convert entry point
Browse files Browse the repository at this point in the history
Install dos2unix command and run dos2unix on the entry point script.
This is need to guarantee that the entry point script is using Unix
line ending, if this is not the case the container will fail to
start.

Note that even if the entry point script is checked in with Unix line
ending cloning the repo on a windows system can change the line
ending to DOS depending on how git is installed on windows.
By default git will convert from Unix to DOS line ending while files
are checkout and convert back to Unix line ending on check in.

Fixes: zephyrproject-rtos#10

Signed-off-by: Jan Van Winkel <[email protected]>
  • Loading branch information
vanwinkeljan authored and nashif committed Jan 7, 2020
1 parent acdcb27 commit 2c55a5d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ RUN dpkg --add-architecture i386 && \
ccache \
device-tree-compiler \
dfu-util \
dos2unix \
doxygen \
file \
g++ \
Expand Down Expand Up @@ -108,6 +109,7 @@ ENV DISPLAY=:0
RUN chown -R user:user /home/user

ADD ./entrypoint.sh /home/user/entrypoint.sh
RUN dos2unix /home/user/entrypoint.sh

EXPOSE 5900

Expand Down

0 comments on commit 2c55a5d

Please sign in to comment.