diff --git a/.gitignore b/.gitignore index ff21ddec..99ad6b47 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /*.sh~ /*.img src/include/asuro.pas +.vscode/launch.json +.vscode diff --git a/Dockerfile b/Dockerfile index 14ad3ec2..c9c8befb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ VOLUME ["/code"] RUN dpkg --add-architecture i386 && \ apt-get update -RUN apt-get install nasm curl make:i386 binutils:i386 xorriso grub-pc-bin -y +RUN apt-get install nasm curl make:i386 binutils:i386 xorriso grub-pc-bin dos2unix -y RUN apt-get clean RUN curl https://sourceforge.net/projects/freepascal/files/Linux/2.6.4/fpc-2.6.4.i386-linux.tar/download --output fpc.tar -L && \ tar -xf fpc.tar @@ -15,4 +15,5 @@ RUN ./install.sh COPY compile.sh /compile.sh RUN mkdir /code WORKDIR /code -ENTRYPOINT ["/compile.sh"] \ No newline at end of file +RUN find . -type f -print0 | xargs -0 dos2unix +ENTRYPOINT ["/bin/bash", "/compile.sh"] \ No newline at end of file diff --git a/src/.vscode/launch.json b/src/.vscode/launch.json deleted file mode 100644 index 506fabea..00000000 --- a/src/.vscode/launch.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "Debug", - "type": "gdb", - "request": "launch", - "target": "./bin/executable", - "cwd": "${workspaceRoot}" - } - ] -} \ No newline at end of file