Upgrade Docker build process to work with mitsuba2-next on a local dev env (eradiate#165)

* Upgrade the docker build process to the latest mitsuba2 kernel

* Remove docker build schedule. Build docker image on tags and manual triggers only

* Add environment variable to configure Mitsuba2 compilation parallelism, 4 cores by default

* Add documentation on docker compilation parallelism control

* Docker: Fix Mitsuba build not using Eradiate presets

* Upgrade cmake

* Add missing libLLVM

Author: wint3ria

.github/workflows/docker.yml

@@ -6,11 +6,7 @@ name: Docker build
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
   push:
-    tags: [ v*.*.* ]
-
-  # Trigger every day at 23:42
-  schedule:
-    - cron: '42 23 * * *'
+    tags: [ 'v*.*.*', 'build_*' ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

docker-build.yml

@@ -24,6 +24,7 @@ services:
         BASE_IMAGE: ${REGISTRY:-rayference}/eradiate-base
         BASE_IMAGE_VERSION: ${VERSION:-dirty}
         ERADIATE_KERNEL_VERSION: ${VERSION:-dirty}
+        NUM_CORES: ${NUM_CORES:-4}
 
   # Contains a properly configured Eradiate kernel
   eradiate-kernel:

docker/eradiate-kernel-builder/Dockerfile

@@ -4,28 +4,29 @@ ARG BASE_IMAGE_VERSION
 FROM ${BASE_IMAGE}:${BASE_IMAGE_VERSION}
 
 ARG ERADIATE_KERNEL_VERSION
+ARG NUM_CORES=4
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y   \
-    cmake                                           \
     git                                             \
     ninja-build                                     \
     clang-9                                         \
     libc++-9-dev                                    \
     libc++abi-9-dev                                 \
     libpng-dev                                      \
     zlib1g-dev                                      \
+    build-essential                                 \
     libjpeg-dev
 
+RUN conda install -y cmake
+
 ENV CC=clang-9
 ENV CXX=clang++-9
 
 COPY . /sources/eradiate
 WORKDIR /sources/eradiate
 RUN make conda-init
-RUN git submodule update --init --recursive
 
-RUN mkdir -p /build/eradiate-kernel                                                                                       \
-    && cd /build/eradiate-kernel                                                                                          \
-    && cmake -GNinja -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") /sources/eradiate/ext/mitsuba2 \
-    && ninja                                                                                                              \
-    && tar -cvf eradiate-kernel-dist_${ERADIATE_KERNEL_VERSION}.tar ./dist
+WORKDIR /build/eradiate-kernel
+RUN cmake --preset default -S /sources/eradiate -B .
+RUN cmake --build . -j${NUM_CORES}
+

docker/eradiate-kernel/Dockerfile

@@ -9,18 +9,14 @@ FROM ${BASE_IMAGE}:${BASE_IMAGE_VERSION}
 
 ARG ERADIATE_KERNEL_VERSION
 
-COPY --from=build /build/eradiate-kernel/eradiate-kernel-dist_${ERADIATE_KERNEL_VERSION}.tar /build/mitsuba/
+COPY --from=build /build/eradiate-kernel /mitsuba
 
-RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y ninja-build cmake libc++-9-dev libz-dev libpng-dev libjpeg-dev libxrandr-dev libxinerama-dev libxcursor-dev
+RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y ninja-build cmake libc++-9-dev libz-dev libpng-dev libjpeg-dev libxrandr-dev libxinerama-dev libxcursor-dev llvm-9
 
-RUN mkdir -p /build/mistuba /mitsuba && cd /build/mitsuba && tar -xf eradiate-kernel-dist_${ERADIATE_KERNEL_VERSION}.tar  \
-    && mv dist /mitsuba/dist \
-    && cd / && rm -rf /build
-
-ENV MITSUBA_DIR=/mitsuba
+ENV MITSUBA_DIR=/mitsuba/ext/mitsuba2
 WORKDIR /app
 
-ENV PYTHONPATH="$MITSUBA_DIR/dist/python"
-ENV PATH="$MITSUBA_DIR/dist:$PATH"
+ENV PYTHONPATH="$MITSUBA_DIR/python"
+ENV PATH="$MITSUBA_DIR:$PATH"
 
 CMD mitsuba --help

docker/eradiate/Dockerfile

@@ -13,13 +13,13 @@ COPY --from=build /sources/eradiate /sources/eradiate
 
 WORKDIR /sources/eradiate
 
-RUN wget https://eradiate.eu/data/solid_2017.zip \
-    && wget https://eradiate.eu/data/us76_u86_4-spectra.zip \
-    && cd resources/data && (unzip ../../solid_2017.zip || true) \
-    && (unzip ../../spectra-us76_u86_4.zip || true)
+SHELL ["conda", "run", "-n", "docker", "/bin/bash", "-c"]
 
+ENV LD_LIBRARY_PATH=/mitsuba/ext/mitsuba2
 ENV ERADIATE_DIR=/sources/eradiate
 
 RUN make conda-init
 
+RUN ertdownload
+
 WORKDIR /app

docs/rst/getting_started/docker.rst

@@ -207,5 +207,5 @@ A ``docker-compose`` config file named ``docker-build.yml`` is provided at the r
 
 .. code:: bash
 
-    # Build all docker images specifying a custom version
-    VERSION=myLocalVersion docker-compose -f docker-build.yml build
+    # Build all docker images specifying a custom version, using 16 cores
+    VERSION=myLocalVersion NUM_CORES=16 docker-compose -f docker-build.yml build