Skip to content

Commit f297873

Browse files
committed
update dependence for makefile
1 parent 617d929 commit f297873

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

docker/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
5353
libtool \
5454
tree \
5555
openjdk-17-jdk \
56+
lcov \
5657
libpcre2-dev \
58+
gcc-riscv64-unknown-elf \
5759
help2man && \
5860
apt-get clean && \
5961
rm -rf /var/lib/apt/lists/*
@@ -128,6 +130,10 @@ RUN mkdir /var/run/sshd && \
128130

129131
# Switch to the new user
130132
USER user
133+
134+
RUN pip3 install toffee-test filelock && \
135+
pip3 install pytoffee==0.2.3
136+
131137
# Set the default shell to bash
132138
SHELL ["/bin/bash", "-c"]
133139
# Set working directory

docker/Dockerfile.full

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
1-
FROM ghcr.io/xs-mlvp/envbase:latest
1+
FROM tutorial_base
22

33
USER user
44
WORKDIR /workspace
55

66

77
RUN echo 'export PATH="$HOME/.local/bin:$PATH"' >> /home/user/.bashrc
88

9-
RUN pip3 install toffee-test filelock && \
10-
pip3 install pytoffee==0.2.3 && \
11-
git clone https://github.com/XS-MLVP/tutorial-records.git --depth=1 && \
9+
RUN git clone https://github.com/XS-MLVP/tutorial-records.git --depth=1 && \
1210
mv tutorial-records/tutorials/code-samples . && \
1311
rm -rf tutorial-records
1412

15-
RUN sudo apt-get update && sudo apt-get install -y --no-install-recommends \
16-
lcov && \
17-
sudo apt-get clean && \
18-
sudo rm -rf /var/lib/apt/lists/*
19-
2013
RUN cd code-samples && \
2114
git clone https://github.com/OpenXiangShan/XSPdb.git --depth=1 xspdb && \
2215
cd xspdb && \

0 commit comments

Comments
 (0)