docker: factor out base docker image that builds simulators but not images yet

4e22dcc5 · Antoine Kaufmann · 91190709 · 4e22dcc5 · 4e22dcc5 · 4e22dcc5
Commit 4e22dcc5 authored Jun 09, 2022 by Antoine Kaufmann
Show whitespace changes
Inline Side-by-side

Showing with 20 additions and 17 deletions

docker/Dockerfile docker/Dockerfile +1 -17

docker/Dockerfile.base docker/Dockerfile.base +17 -0

docker/rules.mk docker/rules.mk +2 -0

No files found.
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
-FROM simbricks/simbricks-build:latest
-COPY . /simbricks
-WORKDIR /simbricks
-RUN make -j `nproc` ENABLE_VERILATOR=y
-RUN git submodule update --init sims/external/qemu \
- && make -j `nproc` sims/external/qemu/ready \
- && bash docker/cleanup_external.sh
-RUN git submodule update --init sims/external/gem5 \
- && make -j `nproc` sims/external/gem5/ready \
- && bash docker/cleanup_gem5.sh
-RUN git submodule update --init sims/external/femu \
- && make -j `nproc` sims/external/femu/ready
-RUN git submodule update --init sims/external/ns-3 \
- && make -j `nproc` sims/external/ns-3/ready
+FROM simbricks/simbricks-base:latest
 RUN make -j `nproc` build-images-min COMPRESSED_IMAGES=true \
 && bash docker/cleanup_images.sh
-ENV PYTHONPATH=/simbricks/experiments
-RUN sudo cp docker/simbricks-run /usr/bin/ \
- && sudo chmod 755 /usr/bin/simbricks-run
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
+FROM simbricks/simbricks-build:latest
+COPY . /simbricks
+WORKDIR /simbricks
+RUN make -j `nproc` ENABLE_VERILATOR=y
+RUN git submodule update --init sims/external/qemu \
+ && make -j `nproc` sims/external/qemu/ready \
+ && bash docker/cleanup_external.sh
+RUN git submodule update --init sims/external/gem5 \
+ && make -j `nproc` sims/external/gem5/ready \
+ && bash docker/cleanup_gem5.sh
+RUN git submodule update --init sims/external/femu \
+ && make -j `nproc` sims/external/femu/ready
+RUN git submodule update --init sims/external/ns-3 \
+ && make -j `nproc` sims/external/ns-3/ready
+ENV PYTHONPATH=/simbricks/experiments
+RUN sudo cp docker/simbricks-run /usr/bin/ \
+ && sudo chmod 755 /usr/bin/simbricks-run
--- a/docker/rules.mk
+++ b/docker/rules.mk
@@ -25,6 +25,8 @@ include mk/subdir_pre.mk
 docker-images:
 	docker build -t simbricks/simbricks-build:latest \
 		-f docker/Dockerfile.buildenv docker
+	docker build -t simbricks/simbricks-base:latest \
+		-f docker/Dockerfile.base .
 	docker build -t simbricks/simbricks:latest \
 		-f docker/Dockerfile .
 	docker build -t simbricks/simbricks-runenv:latest \