Skip to content

GitLab

Commit 60343d16 authored by Jonas Kaufmann's avatar Jonas Kaufmann Committed by Antoine Kaufmann
Browse files

docker: install required Python packages to build documentation 

Otherwise, `make documentation` fails in the devcontainer.
parent 43c9b975
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
doc/requirements.txt
View file @ 60343d16
breathe breathe
sphinx
sphinx-rtd-theme sphinx-rtd-theme
docker/Dockerfile.buildenv
View file @ 60343d16
...@@ -30,8 +30,6 @@ RUN apt-get update \ ...@@ -30,8 +30,6 @@ RUN apt-get update \
python-is-python3 \ python-is-python3 \
python3-dev \ python3-dev \
python3-pip \ python3-pip \
python3-sphinx \
python3-sphinx-rtd-theme \
rsync \ rsync \
scons \ scons \
unzip \ unzip \
...@@ -40,7 +38,7 @@ RUN apt-get update \ ...@@ -40,7 +38,7 @@ RUN apt-get update \
vim \ vim \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY requirements.txt /tmp/requirements.txt COPY requirements.txt /tmp/requirements.txt
RUN pip install -r /tmp/requirements.txt RUN pip install --no-cache-dir --upgrade -r /tmp/requirements.txt
COPY verilator.patch /tmp/ COPY verilator.patch /tmp/
RUN cd /tmp \ RUN cd /tmp \
&& git clone -b v4.010 https://github.com/verilator/verilator \ && git clone -b v4.010 https://github.com/verilator/verilator \
......
docker/rules.mk
View file @ 60343d16
...@@ -33,7 +33,7 @@ DOCKER_IMAGES := simbricks/simbricks-build simbricks/simbricks-base \ ...@@ -33,7 +33,7 @@ DOCKER_IMAGES := simbricks/simbricks-build simbricks/simbricks-base \
REQUIREMENTS_TXT := $(d)requirements.txt REQUIREMENTS_TXT := $(d)requirements.txt
$(REQUIREMENTS_TXT): $(REQUIREMENTS_TXT):
cp requirements.txt $@ cat requirements.txt doc/requirements.txt > $@
docker-images: $(REQUIREMENTS_TXT) docker-images: $(REQUIREMENTS_TXT)
docker build -t \ docker build -t \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment