Merge pull request #902 from ucb-bar/marshalDocker

Add marshal support to the Dockerfile

.circleci/config.yml

@@ -12,7 +12,7 @@ parameters:
 executors:
     main-env:
         docker:
-            - image: ucbbar/chipyard-ci-image:1d51bb90
+            - image: ucbbar/chipyard-ci-image:554b436
         environment:
             JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
 

dockerfiles/Dockerfile

@@ -7,6 +7,8 @@ ARG CHIPYARD_HASH
 
 MAINTAINER https://groups.google.com/forum/#!forum/chipyard
 
+SHELL ["/bin/bash", "-c"] 
+
 # Install dependencies for ubuntu-req.sh
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -15,7 +17,9 @@ RUN apt-get update && \
                sudo \
                ca-certificates \
                keyboard-configuration \
-               console-setup
+               console-setup \
+               bc \
+               unzip
 
 WORKDIR /root
 
@@ -51,6 +55,19 @@ RUN cd chipyard && \
         export MAKEFLAGS=-"j $(nproc)" && \
         ./scripts/build-toolchains.sh esp-tools 1>/dev/null
 
+
+# Set up FireMarshal. Building and cleaning br-base.json builds the underlying
+# buildroot image (which takes a long time) but doesn't keep all the br-base
+# stuff around (since that's faster to rebuild).
+RUN cd chipyard && \
+        source env.sh && \
+        cd software/firemarshal && \
+        ./init-submodules.sh && \
+        pip3 install -r python-requirements.txt && \
+        marshal build br-base.json && \
+        marshal clean br-base.json
+        
+
 # Run script to set environment variables on entry
 ENTRYPOINT ["chipyard/scripts/entrypoint.sh"]
 

dockerfiles/README.md

@@ -13,7 +13,8 @@ Build and Deploy the Container
     sudo docker tag <IMAGE_ID> <PATH_NAME>:tag . # to tag the image after the build (ex. 0.0.3)
     sudo docker login # login into the account to push to
     sudo docker push <PATH_NAME>:tag # to push to repo with tag
-    sudo docker run -it <IMAGE_ID> bash # to run an interactive version of the container
+    sudo docker run -it --privileged <IMAGE_ID> bash # to run an interactive version of the container
+
 
 Path Names
 ----------