From e29db5a8ede8046e990b221dd198a41d9aaf90c8 Mon Sep 17 00:00:00 2001 From: yudejp Date: Tue, 4 May 2021 11:04:59 +0900 Subject: [PATCH] Update initialization script --- .devcontainer/Dockerfile | 13 ------------- README.md | 3 ++- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 79bd9ec..7170e3c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,17 +1,4 @@ # See here for image contents: https://github.com/sarisia/mikanos-docker FROM ghcr.io/sarisia/mikanos:latest - ENV DISPLAY=$DISPLAY -# [Optional] Uncomment this section to install additional OS packages. -# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ -# && apt-get -y install --no-install-recommends -#RUN "source /home/vscode/edk2/edksetup.sh" >> /home/vscode/.bashrc -#RUN rm /home/vscode/edk2/Conf/target.txt -RUN ln -s /workspaces/firmament/.devcontainer/Conf/target.txt /home/vscode/edk2/Conf/target.txt -RUN ln -s /workspaces/firmament /home/vscode/edk2/firmament -RUN ln -s /home/vscode/edk2/Build/LoaderX64/DEBUG_CLANG38/X64/Loader.efi /home/vscode/BOOTX64.EFI -RUN ln -s /workspaces/firmament/.devcontainer/make_disk.sh /home/vscode/make_disk.sh -RUN ln -s /workspaces/firmament/.devcontainer/run_qemu.sh /home/vscode/run_qemu.sh -RUN chmod +x /home/vscode/run_qemu.sh -RUN chmod +x /home/vscode/make_disk.sh \ No newline at end of file diff --git a/README.md b/README.md index f3a4d2c..9c13219 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # firmament: 🌄 Challenge of building operating system (reffering to MikanOS) ## Setup 1. Build container on Visual Studio Code. -2. Run: `cd ~/edk2; source edksetup.sh` +1. Run: `.devcontainer/init.sh` (on `/workspaces/firmament`) +1. Run: `cd ~/edk2; source edksetup.sh` ## Utils ### Build * Run: `cd ~/edk2; build`