From 632b1937c50126f09d05c4448945494e1a4b365b Mon Sep 17 00:00:00 2001 From: Jianfeng Jiang Date: Mon, 25 Dec 2023 08:01:48 +0000 Subject: [PATCH] Rename docker image as asterinas/asterinas --- .github/workflows/cargo_check.yml | 4 ++-- .github/workflows/docker_build.yml | 4 ++-- .github/workflows/integration_test.yml | 4 ++-- .github/workflows/unit_test.yml | 4 ++-- README.md | 4 ++-- regression/syscall_test/Makefile | 6 +++--- runner/grub/grub.cfg.template | 2 +- runner/src/gdb.rs | 6 +++--- tools/bump_version.sh | 4 ++-- tools/docker/Dockerfile.ubuntu22.04 | 18 +++++++++--------- tools/docker/README.md | 6 +++--- tools/docker/run_dev_container.sh | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/cargo_check.yml b/.github/workflows/cargo_check.yml index d05eb6a07..30f72a3c8 100644 --- a/.github/workflows/cargo_check.yml +++ b/.github/workflows/cargo_check.yml @@ -10,9 +10,9 @@ jobs: test: runs-on: ubuntu-latest timeout-minutes: 10 - container: jinuxdev/jinux:0.2.2 + container: asterinas/asterinas:0.2.2 steps: - - run: echo "Running in jinuxdev/jinux:0.2.2" + - run: echo "Running in asterinas/asterinas:0.2.2" - uses: actions/checkout@v3 diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index 675259e4f..745d9711f 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -36,6 +36,6 @@ jobs: file: ./tools/docker/Dockerfile.ubuntu22.04 platforms: linux/amd64 push: true - tags: jinuxdev/jinux:${{ steps.fetch-versions.outputs.aster_version }} + tags: asterinas/asterinas:${{ steps.fetch-versions.outputs.aster_version }} build-args: | - "JINUX_RUST_VERSION=${{ steps.fetch-versions.outputs.rust_version }}" + "ASTER_RUST_VERSION=${{ steps.fetch-versions.outputs.rust_version }}" diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index df94fbab1..962999bfa 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -10,9 +10,9 @@ jobs: test: runs-on: ubuntu-latest timeout-minutes: 30 - container: jinuxdev/jinux:0.2.2 + container: asterinas/asterinas:0.2.2 steps: - - run: echo "Running in jinuxdev/jinux:0.2.2" + - run: echo "Running in asterinas/asterinas:0.2.2" - uses: actions/checkout@v3 diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index a9b4dc572..bfcfa9542 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -10,9 +10,9 @@ jobs: test: runs-on: ubuntu-latest timeout-minutes: 15 - container: jinuxdev/jinux:0.2.2 + container: asterinas/asterinas:0.2.2 steps: - - run: echo "Running in jinuxdev/jinux:0.2.2" + - run: echo "Running in asterinas/asterinas:0.2.2" - uses: actions/checkout@v3 diff --git a/README.md b/README.md index 6724a332a..a0d5783ab 100644 --- a/README.md +++ b/README.md @@ -34,12 +34,12 @@ git clone [repository url] 2. After downloading the source code, run the following command to pull the development image. ```bash -docker pull jinuxdev/jinux:0.2.2 +docker pull asterinas/asterinas:0.2.2 ``` 3. Start the development container. ```bash -docker run -it --privileged --network=host --device=/dev/kvm -v `pwd`:/root/asterinas jinuxdev/jinux:0.2.2 +docker run -it --privileged --network=host --device=/dev/kvm -v `pwd`:/root/asterinas asterinas/asterinas:0.2.2 ``` **All build and test commands should be run inside the development container.** diff --git a/regression/syscall_test/Makefile b/regression/syscall_test/Makefile index 9b864904f..ca06ca6d3 100644 --- a/regression/syscall_test/Makefile +++ b/regression/syscall_test/Makefile @@ -3,8 +3,8 @@ TESTS ?= open_test read_test statfs_test chmod_test pty_test uidgid_test vdso_cl MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) CUR_DIR := $(patsubst %/,%,$(dir $(MKFILE_PATH))) BUILD_DIR ?= $(CUR_DIR)/../build -ifdef JINUX_PREBUILT_SYSCALL_TEST - BIN_DIR := $(JINUX_PREBUILT_SYSCALL_TEST) +ifdef ASTER_PREBUILT_SYSCALL_TEST + BIN_DIR := $(ASTER_PREBUILT_SYSCALL_TEST) else BIN_DIR := $(BUILD_DIR)/syscall_test_bins SRC_DIR := $(BUILD_DIR)/gvisor_src @@ -21,7 +21,7 @@ all: $(TESTS) $(TESTS): $(BIN_DIR) $(TARGET_DIR) @cp -f $ /dev/null; then \ echo "bazel is not installed, please run $(CUR_DIR)/install_bazel.sh with sudo permission to install it."; \ diff --git a/runner/grub/grub.cfg.template b/runner/grub/grub.cfg.template index fec85025c..c7db16aba 100644 --- a/runner/grub/grub.cfg.template +++ b/runner/grub/grub.cfg.template @@ -7,7 +7,7 @@ set timeout_style=#GRUB_TIMEOUT_STYLE# set timeout=#GRUB_TIMEOUT# -menuentry 'jinux' { +menuentry 'asterinas' { #GRUB_CMD_KERNEL# #KERNEL# #KERNEL_COMMAND_LINE# #GRUB_CMD_INITRAMFS# /boot/initramfs.cpio.gz boot diff --git a/runner/src/gdb.rs b/runner/src/gdb.rs index a976b1caf..f5a13b69e 100644 --- a/runner/src/gdb.rs +++ b/runner/src/gdb.rs @@ -21,7 +21,7 @@ pub fn run_gdb_client(path: &PathBuf, gdb_grub: bool) { let mut gdb_cmd = Command::new("gdb"); // Set the architecture, otherwise GDB will complain about. gdb_cmd.arg("-ex").arg("set arch i386:x86-64:intel"); - let grub_script = "/tmp/jinux-gdb-grub-script"; + let grub_script = "/tmp/aster-gdb-grub-script"; if gdb_grub { let grub_dir = PathBuf::from(qemu_grub_efi::GRUB_PREFIX) .join("lib") @@ -41,7 +41,7 @@ pub fn run_gdb_client(path: &PathBuf, gdb_grub: bool) { for line in lines { if line.contains("target remote :1234") { // Connect to the GDB server. - writeln!(f, "target remote /tmp/jinux-gdb-socket").unwrap(); + writeln!(f, "target remote /tmp/aster-gdb-socket").unwrap(); } else { writeln!(f, "{}", line).unwrap(); } @@ -53,7 +53,7 @@ pub fn run_gdb_client(path: &PathBuf, gdb_grub: bool) { // Connect to the GDB server. gdb_cmd .arg("-ex") - .arg("target remote /tmp/jinux-gdb-socket"); + .arg("target remote /tmp/aster-gdb-socket"); } // Connect to the GDB server and run. println!("running:{:#?}", gdb_cmd); diff --git a/tools/bump_version.sh b/tools/bump_version.sh index 08232ffb0..854e16da2 100755 --- a/tools/bump_version.sh +++ b/tools/bump_version.sh @@ -9,10 +9,10 @@ update_cargo_versions() { sed -i "s/^version = \"[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+\"$/version = \"${new_version}\"/g" $1 } -# Update Docker image versions (`jinuxdev/jinux:{version}`) in file $1 +# Update Docker image versions (`asterinas/asterinas:{version}`) in file $1 update_image_versions() { echo "Updating file $1" - sed -i "s/jinuxdev\/jinux:[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+/jinuxdev\/jinux:${new_version}/g" $1 + sed -i "s/asterinas\/asterinas:[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+/asterinas\/asterinas:${new_version}/g" $1 } SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) diff --git a/tools/docker/Dockerfile.ubuntu22.04 b/tools/docker/Dockerfile.ubuntu22.04 index 39d7d4bb5..99ee9114f 100644 --- a/tools/docker/Dockerfile.ubuntu22.04 +++ b/tools/docker/Dockerfile.ubuntu22.04 @@ -182,15 +182,15 @@ RUN make defconfig \ && sed -i "s/# CONFIG_FEATURE_SH_STANDALONE is not set/CONFIG_FEATURE_SH_STANDALONE=y/g" .config \ && make -j -#= The final stages to produce the Jinux development image ==================== +#= The final stages to produce the Asterinas development image ==================== FROM build-base as rust # Install Rust ENV PATH="/root/.cargo/bin:${PATH}" -ARG JINUX_RUST_VERSION +ARG ASTER_RUST_VERSION RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain ${JINUX_RUST_VERSION} -y \ + sh -s -- --default-toolchain ${ASTER_RUST_VERSION} -y \ && rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git \ && cargo -V \ && rustup component add rust-src rustc-dev llvm-tools-preview @@ -202,7 +202,7 @@ RUN cargo install \ FROM rust -# Install all Jinux dependent packages +# Install all Asterinas dependent packages RUN apt update && apt-get install -y --no-install-recommends \ cpio \ cpuid \ @@ -226,7 +226,7 @@ RUN apt clean && rm -rf /var/lib/apt/lists/* # Prepare the system call test suite COPY --from=syscall_test /root/syscall_test/build/syscall_test_bins /root/syscall_test_bins -ENV JINUX_PREBUILT_SYSCALL_TEST=/root/syscall_test_bins +ENV ASTER_PREBUILT_SYSCALL_TEST=/root/syscall_test_bins # Install QEMU built from the previous stages COPY --from=qemu /usr/local/qemu /usr/local/qemu @@ -249,9 +249,9 @@ COPY --from=busybox /root/busybox/busybox /bin/busybox # Install benchmarks built from the previous stages COPY --from=build-benchmarks /usr/local/benchmark /usr/local/benchmark -# Add the path of jinux tools -ENV PATH="/root/jinux/target/bin:${PATH}" +# Add the path of Asterinas tools +ENV PATH="/root/asterinas/target/bin:${PATH}" -VOLUME [ "/root/jinux" ] +VOLUME [ "/root/asterinas" ] -WORKDIR /root/jinux +WORKDIR /root/asterinas diff --git a/tools/docker/README.md b/tools/docker/README.md index 036783e5a..69149de90 100644 --- a/tools/docker/README.md +++ b/tools/docker/README.md @@ -1,6 +1,6 @@ # Asterinas Development Docker Images -Asterinas development Docker images are provided to facilitate developing and testing Asterinas project. These images can be found in the [jinuxdev/jinux](https://hub.docker.com/r/jinuxdev/jinux/) repository on DockerHub. +Asterinas development Docker images are provided to facilitate developing and testing Asterinas project. These images can be found in the [asterinas/asterinas](https://hub.docker.com/r/asterinas/asterinas/) repository on DockerHub. ## Building Docker Images @@ -9,8 +9,8 @@ To build a Docker image for Asterinas and test it on your local machine, navigat ```bash docker buildx build \ -f tools/docker/Dockerfile.ubuntu22.04 \ - --build-arg JINUX_RUST_VERSION=$RUST_VERSION \ - -t jinuxdev/jinux:$ASTER_VERSION \ + --build-arg ASTER_RUST_VERSION=$RUST_VERSION \ + -t asterinas/asterinas:$ASTER_VERSION \ . ``` diff --git a/tools/docker/run_dev_container.sh b/tools/docker/run_dev_container.sh index 8b6a44ed5..92af52d14 100755 --- a/tools/docker/run_dev_container.sh +++ b/tools/docker/run_dev_container.sh @@ -6,6 +6,6 @@ SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) ASTER_SRC_DIR=${SCRIPT_DIR}/../.. CARGO_TOML_PATH=${SCRIPT_DIR}/../../Cargo.toml VERSION=$( cat ${ASTER_SRC_DIR}/VERSION ) -IMAGE_NAME=jinuxdev/jinux:${VERSION} +IMAGE_NAME=asterinas/asterinas:${VERSION} docker run -it --privileged --network=host --device=/dev/kvm -v ${ASTER_SRC_DIR}:/root/asterinas ${IMAGE_NAME}