Skip to content
Snippets Groups Projects
Commit 59aee06b authored by Théo Le Calvar's avatar Théo Le Calvar
Browse files

adapt Dockerfile for apple silicon & fix typo in tasks

parent c9dacbf6
Branches
No related tags found
No related merge requests found
# 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
......@@ -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",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment