diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a62669d4187af5429ae36f7248ef4b954dda6ccc..2d241bdbd53fdb504ed136b88e622baf9c56b400 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,8 +1,8 @@ # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.234.0/containers/cpp/.devcontainer/base.Dockerfile -FROM alpine:latest +FROM --platform=linux/amd64 alpine:latest -RUN apk add bash g++ gdb make qemu qemu-img qemu-system-x86_64 qemu-system-i386 qemu-ui-curses && \ +RUN apk add bash git g++ gdb make qemu qemu-img qemu-system-x86_64 qemu-system-i386 qemu-ui-curses && \ adduser -D -s /bin/bash vscode && \ touch /home/vscode/.bashrc && \ chown vscode:vscode /home/vscode/.bashrc \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 929b1cb84725a77e4c95425b9b128c8a4365572e..3a3ec9b962a64a59bec0ea2251e6231c80a3f410 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -116,11 +116,11 @@ }, "linux": { "comments": "To quit Alt + 2 > quit", - "command": "cd build/boot; qemu-system-x86_64 -curses -net nic,model=ne2k_isa -net user,tftp=./ -cdrom grub.iso" + "command": "cd build/boot; qemu-system-x86_64 -display curses -net nic,model=ne2k_isa -net user,tftp=./ -cdrom grub.iso" }, "osx": { "comments": "To quit Alt + 2 > quit", - "command": "cd build/boot; qemu-system-x86_64 -curses -net nic,model=ne2k_isa -net user,tftp=./ -cdrom grub.iso" + "command": "cd build/boot; qemu-system-x86_64 -display curses -net nic,model=ne2k_isa -net user,tftp=./ -cdrom grub.iso" }, "group": { "kind": "build", @@ -141,11 +141,11 @@ }, "linux": { "comments": "To quit Alt + 2 > quit", - "command": "cd build/boot; qemu-system-i386 -curses -S -s -net nic,model=ne2k_isa -net user,tftp=./ -cdrom grub.iso" + "command": "cd build/boot; qemu-system-i386 -display curses -S -s -net nic,model=ne2k_isa -net user,tftp=./ -cdrom grub.iso" }, "osx": { "comments": "To quit Alt + 2 > quit", - "command": "cd build/boot; qemu-system-i386 -curses -S -s -net nic,model=ne2k_isa -net user,tftp=./ -cdrom grub.iso" + "command": "cd build/boot; qemu-system-i386 -display curses -S -s -net nic,model=ne2k_isa -net user,tftp=./ -cdrom grub.iso" }, "group": { "kind": "build",