Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-22 08:53:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename docker image as asterinas/asterinas

Browse Source
This commit is contained in:
Jianfeng Jiang
2023-12-25 08:01:48 +00:00
committed by Tate, Hongliang Tian
parent 99f6765ced
commit 632b1937c5
12 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/docker/Dockerfile.ubuntu22.04
View File

@ -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

6
tools/docker/README.md
View File

@ -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 \
.
```

2
tools/docker/run_dev_container.sh
View File

@ -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}