From 6d42d601112cce9eeddc719f0967b0eadb0c8376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Le=20Calvar?= <theo.le-calvar@imt-atlantique.fr>
Date: Wed, 23 Nov 2022 14:30:45 +0100
Subject: [PATCH] adapt Dockerfile for apple silicon & fix typo in tasks
---
.devcontainer/Dockerfile | 4 ++--
.vscode/tasks.json | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index a62669d..2d241bd 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 929b1cb..3a3ec9b 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",
--
GitLab