From 29f9a7396a79924e191085f1b195b8d23bb4fb62 Mon Sep 17 00:00:00 2001
From: Aaron Hance <ah@aaronhance.me>
Date: Sun, 20 Jun 2021 21:05:25 +0100
Subject: [PATCH 1/2] Update to compose file, fixed line endings issue

---
 .gitignore              |  2 ++
 .vscode/launch.json     | 20 --------------------
 .vscode/tasks.json      | 31 -------------------------------
 src/.vscode/launch.json | 12 ------------
 4 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 .vscode/launch.json
 delete mode 100644 .vscode/tasks.json
 delete mode 100644 src/.vscode/launch.json

diff --git a/.gitignore b/.gitignore
index 98276856..77c1c238 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@
 /*.md5
 /*.sh~
 /*.img
+.vscode/launch.json
+.vscode
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index c945c666..00000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "configurations": [
-        {
-            "name":"Run",
-            "request": "launch",
-            "type": "coreclr",
-            "preLaunchTask": "Build",
-            "program": "VBoxSDL",
-            "args": [
-                "--comment", 
-                "Asuro", 
-                "--startvm", 
-                "7d395c96-891c-4139-b77d-9b6b144b0b93"
-            ],
-            "cwd": "${workspaceFolder}",
-            "console": "internalConsole",
-            "internalConsoleOptions": "neverOpen"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
deleted file mode 100644
index 3f74eb24..00000000
--- a/.vscode/tasks.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Build",
-            "command": "docker-compose",
-            "args": [
-                "run",
-                "builder"
-            ],
-            "type": "shell",
-            "problemMatcher": [],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
-        },
-        {
-            "label": "Build (Builder)",
-            "command": "docker-compose",
-            "args": [
-                "build",
-                "builder"
-            ],
-            "type": "shell"
-        }
-    ]
-}
\ 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

From 9986bb877ccd5628bc7842659d8244d56f126f94 Mon Sep 17 00:00:00 2001
From: Aaron Hance <ah@aaronhance.me>
Date: Sun, 20 Jun 2021 21:06:25 +0100
Subject: [PATCH 2/2] Real Update to compose file, fixed line endings issue

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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