Merge branch 'ch2' into ch3

Author: Azure-stars

Dockerfile

@@ -1,90 +1,90 @@
-# syntax=docker/dockerfile:1
-# This Dockerfile is adapted from https://github.com/LearningOS/rCore-Tutorial-v3/blob/main/Dockerfile
-# with the following major updates:
-# - ubuntu 18.04 -> 20.04
-# - qemu 5.0.0 -> 7.0.0
-# - Extensive comments linking to relevant documentation
-FROM ubuntu:20.04
+# Reconstructed Dockerfile from docker history
+# Base image: Ubuntu 22.04
+FROM ubuntu:22.04
 
+# Build arguments
+ARG RELEASE
+ARG LAUNCHPAD_BUILD_ARCH
 ARG QEMU_VERSION=7.0.0
 ARG HOME=/root
-
-# 0. Install general tools
 ARG DEBIAN_FRONTEND=noninteractive
+
+# Install basic tools
 RUN apt-get update && \
     apt-get install -y \
-        curl \
-        git \
-        python3 \
-        wget
-
-# 1. Set up QEMU RISC-V
-# - https://learningos.github.io/rust-based-os-comp2022/0setup-devel-env.html#qemu
-# - https://www.qemu.org/download/
-# - https://wiki.qemu.org/Documentation/Platforms/RISCV
-# - https://risc-v-getting-started-guide.readthedocs.io/en/latest/linux-qemu.html
-
-# 1.1. Download source
-WORKDIR ${HOME}
+    curl \
+    git \
+    python3 \
+    wget \
+    xz-utils
+
+# Set working directory
+WORKDIR /root
+
+# Download and extract QEMU
 RUN wget https://download.qemu.org/qemu-${QEMU_VERSION}.tar.xz && \
     tar xvJf qemu-${QEMU_VERSION}.tar.xz
 
-# 1.2. Install dependencies
-# - https://risc-v-getting-started-guide.readthedocs.io/en/latest/linux-qemu.html#prerequisites
+# Install QEMU build dependencies
 RUN apt-get install -y \
-        autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev \
-        gawk build-essential bison flex texinfo gperf libtool patchutils bc \
-        zlib1g-dev libexpat-dev git \
-        ninja-build pkg-config libglib2.0-dev libpixman-1-dev libsdl2-dev
+    autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev \
+    gawk build-essential bison flex texinfo gperf libtool patchutils bc \
+    zlib1g-dev libexpat-dev git \
+    ninja-build pkg-config libglib2.0-dev libpixman-1-dev libsdl2-dev
 
-# 1.3. Build and install from source
-WORKDIR ${HOME}/qemu-${QEMU_VERSION}
+# Build and install QEMU
+WORKDIR /root/qemu-7.0.0
 RUN ./configure --target-list=riscv64-softmmu,riscv64-linux-user && \
     make -j$(nproc) && \
     make install
 
-# 1.4. Clean up
-WORKDIR ${HOME}
+# Clean up QEMU build files
+WORKDIR /root
 RUN rm -rf qemu-${QEMU_VERSION} qemu-${QEMU_VERSION}.tar.xz
 
-# 1.5. Sanity checking
+# Verify QEMU installation
 RUN qemu-system-riscv64 --version && \
     qemu-riscv64 --version
 
-# 2. Set up Rust
-# - https://learningos.github.io/rust-based-os-comp2022/0setup-devel-env.html#qemu
-# - https://www.rust-lang.org/tools/install
-# - https://github.com/rust-lang/docker-rust/blob/master/Dockerfile-debian.template
-
-# 2.1. Install
+# Set up Rust environment
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
-    PATH=/usr/local/cargo/bin:$PATH \
+    PATH=/usr/local/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
     RUST_VERSION=nightly
+
+# Install Rust
 RUN set -eux; \
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME;
 
-# 2.2. Sanity checking
+# Verify Rust installation
 RUN rustup --version && \
     cargo --version && \
     rustc --version
 
 # 2.3 Env
 RUN cargo install cargo-binutils; \
     rustup target add riscv64gc-unknown-none-elf; \
-	rustup component add rust-src; \
-	rustup component add llvm-tools-preview; \
-	rustup component add rustfmt; \
-	rustup component add clippy;
-
-# 3. Cargo vendor
-WORKDIR ${HOME}
-COPY os/vendor ./os-vendor
-COPY user/vendor ./user-vendor
-
-# Ready to go
-WORKDIR ${HOME}
+    rustup component add rust-src; \
+    rustup component add llvm-tools-preview; \
+    rustup component add rustfmt; \
+    rustup component add clippy;
+
+
+# Install Rust components and tools for rCore development
+RUN rustup default $RUST_VERSION; \
+    cargo install cargo-binutils; \
+    rustup target add riscv64gc-unknown-none-elf; \
+    rustup component add rust-src; \
+    rustup component add llvm-tools-preview; \
+    rustup component add rustfmt; \
+    rustup component add clippy;
+
+# Set working directory
+WORKDIR /root
+
+# Default command
+CMD ["/bin/bash"]

Makefile

@@ -1,8 +1,8 @@
-DOCKER_NAME ?= rcore-tutorial-v3
+DOCKER_NAME ?= rcore-docker
 .PHONY: docker build_docker
 
 docker:
-	docker run --rm -it -v ${PWD}:/mnt -w /mnt ${DOCKER_NAME} bash
+	docker run --network host --rm -it -v ${PWD}:/mnt -w /mnt ${DOCKER_NAME} bash
 
 build_docker: 
 	docker build -t ${DOCKER_NAME} .

README.md

@@ -39,6 +39,25 @@ $ cd os
 $ make run
 ```
 
+If you want to use docker to build and run, you can use the following command:
+```bash
+# After clone the `rCore-Tutorial-Test` repository to your local machine, you can use the following command to build and run:
+$ make build_docker
+$ make docker
+```
+
+If you experience network issues when accessing foreign resources such as GitHub in Docker, you can follow the following suggestions according to your stage:
+
+- Docker pull:
+  1. use proxy: https://docs.docker.com/reference/cli/docker/image/pull/#proxy-configuration
+
+  2. use available domestic source (self-search)
+
+- Docker build: use proxy https://docs.docker.com/engine/cli/proxy/#build-with-a-proxy-configuration
+
+- Docker run: use proxy option, related operations are similar to `Docker build`, can refer to the relevant materials by yourself
+
+
 Notice: $ID is from [1-9]
 
 ## Grading