Skip to content

Commit

Permalink
Update environment
Browse files Browse the repository at this point in the history
  • Loading branch information
doganulus committed Sep 4, 2022
1 parent 12f6a93 commit af32d7a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
13 changes: 6 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ COPY --from=whisper /opt/SweRV-ISS /opt/SweRV-ISS/bin
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install \
git \
curl \
build-essential \
valgrind \
verilator \
gtkwave \
python3 \
Expand All @@ -24,16 +24,15 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
ENV LANG="C"
ENV LC_ALL="C"

## Test graphical apps -- xeyes, xcalc
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install \
x11-apps \
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
# Update pip and install Python packages
RUN python -m pip install --upgrade pip \
&& python -m pip install \
pycachesim

RUN groupadd students -g 1000 \
&& useradd -ms /bin/bash bouncmpe -g 1000 -u 1000

USER bouncmpe

ENV PATH=$PATH:/opt/riscv/bin:/opt/SweRV-ISS/bin
ENV PATH=$PATH:/home/bouncmpe/.local/bin:/opt/riscv/bin:/opt/SweRV-ISS/bin

8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
prerequisites:
docker build \
--tag ghcr.io/bouncmpe/rv32imc \
--tag ghcr.io/bouncmpe/riscv \
--file docker/riscv-gnu-toolchain.dockerfile \
--build-arg RISCV_ARCH=rv32imc \
--build-arg RISCV_ARCH=rv32im \
--build-arg RISCV_ABI=ilp32 \
.

Expand All @@ -17,4 +17,6 @@ build:
.

run:
docker run --rm -it bouncmpe/labs344:latest
docker run --rm -it bouncmpe/labs344:latest

all: build

0 comments on commit af32d7a

Please sign in to comment.