Skip to content

Commit 2c55a5d

Browse files
vanwinkeljannashif
authored andcommitted
Dockerfile: Added dos2unix and convert entry point
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]>
1 parent acdcb27 commit 2c55a5d

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ RUN dpkg --add-architecture i386 && \
2121
ccache \
2222
device-tree-compiler \
2323
dfu-util \
24+
dos2unix \
2425
doxygen \
2526
file \
2627
g++ \
@@ -108,6 +109,7 @@ ENV DISPLAY=:0
108109
RUN chown -R user:user /home/user
109110

110111
ADD ./entrypoint.sh /home/user/entrypoint.sh
112+
RUN dos2unix /home/user/entrypoint.sh
111113

112114
EXPOSE 5900
113115

0 commit comments

Comments
 (0)