docker: local cache, devel build with full build env

Author: casperdcl

Dockerfile

@@ -7,17 +7,17 @@ USER root
 # suppress warnings
 ENV DEBIAN_FRONTEND=noninteractive
 COPY docker/raw-ubuntu.sh /opt/scripts/
-RUN bash /opt/scripts/raw-ubuntu.sh
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked bash /opt/scripts/raw-ubuntu.sh
 #ENV LC_ALL=en_GB.UTF-8
 ENV LANG=en_GB.UTF-8
 ENV LANGUAGE=en_GB:en
 
 COPY docker/build_gadgetron-ubuntu.sh /opt/scripts/
-RUN bash /opt/scripts/build_gadgetron-ubuntu.sh
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked bash /opt/scripts/build_gadgetron-ubuntu.sh
 
 # SIRF external deps
 COPY docker/build_system-ubuntu.sh /opt/scripts/
-RUN bash /opt/scripts/build_system-ubuntu.sh
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked bash /opt/scripts/build_system-ubuntu.sh
 
 # SIRF python deps
 ARG BUILD_GPU=0
@@ -35,13 +35,12 @@ RUN if test "$BUILD_GPU" != 0; then \
 FROM base AS build
 
 COPY docker/update_nvidia_keys.sh /opt/scripts/
-RUN bash /opt/scripts/update_nvidia_keys.sh
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked bash /opt/scripts/update_nvidia_keys.sh
 
 COPY docker/build_essential-ubuntu.sh /opt/scripts/
-RUN bash /opt/scripts/build_essential-ubuntu.sh
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked bash /opt/scripts/build_essential-ubuntu.sh
 
 # ccache
-COPY --link docker/devel/.ccache/ /opt/ccache/
 RUN ccache -o cache_dir=/opt/ccache
 ENV PATH="/usr/lib/ccache:${PATH}"
 
@@ -72,7 +71,7 @@ ARG EXTRA_BUILD_FLAGS=""
 
 # build, install in /opt/SIRF-SuperBuild/{INSTALL,sources/SIRF}, test (if RUN_CTEST)
 COPY docker/user_sirf-ubuntu.sh /opt/scripts/
-RUN BUILD_FLAGS="-G Ninja\
+RUN --mount=type=cache,target=/opt/ccache BUILD_FLAGS="-G Ninja\
  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}\
  -DSTIR_ENABLE_OPENMP=${STIR_ENABLE_OPENMP}\
  -DSTIR_DISABLE_HDF5=${STIR_DISABLE_HDF5}\
@@ -97,12 +96,10 @@ RUN RUN_BUILD=0 \
  bash /opt/scripts/user_sirf-ubuntu.sh \
  && fix-permissions /opt/SIRF-SuperBuild /opt/ccache
 
-FROM base AS sirf
-
 # X11 forwarding
-RUN apt update -qq && apt install -yq --no-install-recommends \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked apt update -qq && apt install -yq --no-install-recommends \
   libx11-xcb1 \
-  && apt clean \
+  && rm -rf /var/lib/apt/lists \
   && mkdir -p /usr/share/X11/xkb \
   && test -e /usr/bin/X || ln -s /usr/bin/Xorg /usr/bin/X
 
@@ -111,6 +108,34 @@ RUN echo 'test -z "$OMP_NUM_THREADS" && export OMP_NUM_THREADS=$(python -c "impo
 COPY --chown=${NB_USER} --chmod=644 --link docker/.bashrc /home/${NB_USER}/
 # RUN sed -i s:PYTHON_INSTALL_DIR:${CONDA_DIR}:g /home/${NB_USER}/.bashrc
 
+# docker-stacks notebook
+#ENV DOCKER_STACKS_JUPYTER_CMD="notebook"
+ENV RESTARTABLE="yes"
+#ENV USE_HTTPS="yes"
+# gadgetron
+EXPOSE 9002
+ENV GADGETRON_RELAY_HOST="0.0.0.0"
+COPY --link docker/15source-sirf.sh docker/25clone-work.sh docker/35gadgetron.sh /usr/local/bin/before-notebook.d/
+ENV NOTEBOOK_ARGS=--PasswordIdentityProvider.hashed_password='sha1:cbf03843d2bb:8729d2fbec60cacf6485758752789cd9989e756c'
+
+# copy ccache from cache mount
+RUN --mount=type=cache,target=/opt/ccache cp -a /opt/ccache /opt/tmp-ccache
+RUN rm -rf /opt/ccache && mv /opt/tmp-ccache /opt/ccache && fix-permissions /opt/ccache
+
+FROM build AS sirf-dev
+
+# install {SIRF-Exercises,CIL-Demos}
+COPY docker/user_demos.sh /opt/scripts/
+ARG BUILD_GPU
+RUN BUILD_GPU=${BUILD_GPU} bash /opt/scripts/user_demos.sh \
+ && fix-permissions /opt/SIRF-Exercises /opt/CIL-Demos "${CONDA_DIR}" /home/${NB_USER}
+
+# docker-stacks notebook
+USER ${NB_UID}
+ENV DEBIAN_FRONTEND=''
+
+FROM base AS sirf
+
 # install from build
 COPY --from=build --link --chown=${NB_USER} /opt/SIRF-SuperBuild/INSTALL/ /opt/SIRF-SuperBuild/INSTALL/
 #COPY --from=build --link --chown=${NB_USER} /opt/SIRF-SuperBuild/sources/SIRF/ /opt/SIRF-SuperBuild/sources/SIRF/
@@ -126,13 +151,3 @@ RUN BUILD_GPU=${BUILD_GPU} bash /opt/scripts/user_demos.sh \
 # docker-stacks notebook
 USER ${NB_UID}
 ENV DEBIAN_FRONTEND=''
-#ENV DOCKER_STACKS_JUPYTER_CMD="notebook"
-ENV RESTARTABLE="yes"
-#ENV USE_HTTPS="yes"
-# gadgetron
-EXPOSE 9002
-ENV GADGETRON_RELAY_HOST="0.0.0.0"
-
-# COPY --from=build --link --chown=${NB_USER} /opt/SIRF-SuperBuild/INSTALL/lib /opt/conda/lib
-COPY --link docker/15source-sirf.sh docker/25clone-work.sh docker/35gadgetron.sh /usr/local/bin/before-notebook.d/
-ENV NOTEBOOK_ARGS=--PasswordIdentityProvider.hashed_password='sha1:cbf03843d2bb:8729d2fbec60cacf6485758752789cd9989e756c'

docker-compose.yml

@@ -29,7 +29,8 @@ services:
   # convenience volume & command to copy image::/opt/ccache to localhost::./docker/devel/.ccache
   # (executed in ./docker/compose.sh by `docker compose up sirf-build`)
   volumes: [./docker/devel/.ccache:/ccache]
-  command: "bash -c 'cp -r /opt/ccache/* /ccache/'"
+  entrypoint: "/bin/bash -c"
+  command: ["cp -r /opt/ccache/* /ccache/"]
   image: synerbi/jupyter:sirf-build-cpu
   build:
    context: .
@@ -43,6 +44,7 @@ services:
   image: synerbi/sirf:latest
   build:
    context: .
+   target: sirf
    args:
     BASE_IMAGE: synerbi/jupyter:scipy-cpu
     Gadgetron_USE_CUDA: "OFF"

docker/docker-compose.devel-gpu.yml

@@ -5,3 +5,4 @@ services:
   image: synerbi/sirf:devel-gpu
   build:
    cache_from: [synerbi/jupyter:sirf-build-devel-gpu]
+   target: sirf-dev

docker/docker-compose.devel.yml

@@ -3,16 +3,15 @@ services:
   image: synerbi/jupyter:sirf-build-devel-cpu
   build:
    args:
-    BUILD_CIL: "ON"
     EXTRA_BUILD_FLAGS: >
      -DDEVEL_BUILD=ON
  sirf:
   container_name: sirf  # for scaling, comment this out https://github.com/docker/compose/issues/3729
   image: synerbi/sirf:devel
   build:
    context: .
+   target: sirf-dev
    args:
-    BUILD_CIL: "ON"
     EXTRA_BUILD_FLAGS: >
      -DDEVEL_BUILD=ON
    cache_from: [synerbi/jupyter:sirf-build-devel-cpu]

docker/docker-compose.gpu.yml

@@ -25,7 +25,6 @@ services:
     BASE_IMAGE: synerbi/jupyter:scipy-gpu
     BUILD_GPU: 1
     Gadgetron_USE_CUDA: "ON"
-    BUILD_CIL: "ON"
  sirf:
   deploy: {resources: {reservations: {devices: [{driver: nvidia, count: all, capabilities: [gpu]}]}}}
   image: synerbi/sirf:latest-gpu
@@ -34,5 +33,4 @@ services:
     BASE_IMAGE: synerbi/jupyter:scipy-gpu
     BUILD_GPU: 1
     Gadgetron_USE_CUDA: "ON"
-    BUILD_CIL: "ON"
    cache_from: [synerbi/jupyter:sirf-build-gpu]