Merge pull request #45 from abel-bernabeu/dev/abel/docker-helpers-2

More improvements for development within the docker container

Author: glguida

.dockerignore

@@ -60,8 +60,11 @@ htmlcov/
 .backup/
 
 # Docker files (don't copy into container)
-Dockerfile
-docker-compose.yaml
+docker/build.sh
+docker/docker-compose.yaml
+docker/Dockerfile
+docker/entrypoint.sh
+docker/run.sh
 .dockerignore
 
 # CI/CD

docker/Dockerfile

@@ -33,8 +33,11 @@ ARG VERBOSE
 # Copy the RISC-V GNU Toolchain from the previous stage
 COPY --from=toolchain_builder ${ET_INSTALL_DIR} ${ET_INSTALL_DIR}
 
+# Update package list from sources
+RUN apt-get update
+
 # Install ET Platform build dependencies
-RUN apt-get update && apt-get install -y \
+RUN apt-get install -y \
     cmake \
     dos2unix \
     gcc \
@@ -59,8 +62,7 @@ RUN apt-get update && apt-get install -y \
     python3-breathe \
     python3-jsonschema \
     libfmt-dev \
-    xxd \
-    && rm -rf /var/lib/apt/lists/*
+    xxd
 
 # Set working directory for the ET Platform source
 WORKDIR /workspace
@@ -85,6 +87,23 @@ RUN cmake \
 ARG BUILD_JOBS=4
 RUN make ${VERBOSE:+VERBOSE=1} -j${BUILD_JOBS}
 
+# Optional tools for developers working inside of the docker.
+#
+# It is fine to add new fancy tools here as long as we keep these packages
+# apart from those listed above, so packages that strictly are build
+# dependencies are not mixed with optionals.
+#
+# Besides, installing these packages has to be one of the last steps in the
+# docker image build, so the list of optionals can be updated frequently
+# without retriggering the bulk of the build for every user.
+RUN apt-get install -y \
+    sudo \
+    vim \
+    ccache
+
+# Clean up package lists
+RUN rm -rf /var/lib/apt/lists/*
+
 # Set the default working directory
 WORKDIR /workspace
 

docker/build.sh

@@ -3,4 +3,4 @@
 set -e
 set -x
 
-docker build -t et-platform -f docker/Dockerfile .
+docker build --build-arg BUILD_JOBS=$(nproc) -t et-platform -f docker/Dockerfile .