TomographicImaging / CIL

A versatile python framework for tomographic imaging
https://tomographicimaging.github.io/CIL/
Apache License 2.0
97 stars 45 forks source link

docker: `23.1.1` #1782

Closed casperdcl closed 7 months ago

casperdcl commented 7 months ago

Before v24 can finally be released, push a new 23.* docker release with urgent fixes.

/CC @lauramurgatroyd

Description

Manually create ghcr.io/tomographicimaging/cil:{23.1.1,latest} based on:

Checklist

diff --git a/Dockerfile b/Dockerfile
index 38227478..69678863 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ ARG CIL_EXTRA_PACKAGES="tigre astra-toolbox"
 COPY --chown="${NB_USER}" scripts/requirements-test.yml environment.yml
 # channel_priority: https://stackoverflow.com/q/58555389
 RUN sed -ri '/tigre|astra-toolbox/d' environment.yml \
-  && for pkg in jupyter-server-proxy $CIL_EXTRA_PACKAGES; do echo "  - $pkg" >> environment.yml; done \
+  && for pkg in 'jupyter-server-proxy>4.1.0' $CIL_EXTRA_PACKAGES; do echo -e "\n  - $pkg" >> environment.yml; done \
   && conda config --env --set channel_priority strict \
   && for ch in defaults ccpi intel conda-forge; do conda config --env --add channels $ch; done \
   && mamba env update -n base \
@@ -32,6 +32,7 @@ ENV TENSORBOARD_PROXY_URL=/user-redirect/proxy/6006/
 # build & install CIL
 COPY --chown="${NB_USER}" . src
 RUN cmake -S ./src -B ./build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCONDA_BUILD=ON -DCMAKE_INSTALL_PREFIX="${CONDA_DIR}" \
+  && sed -i 's!#include <ipps.h>!#include <ipp/ipps.h>!p' src/src/Core/Binning.cpp src/src/Core/include/FBP_filtering.h \
   && cmake --build ./build --target install \
   && rm -rf src build \
   && fix-permissions "${CONDA_DIR}" /home/${NB_USER}
casperdcl commented 7 months ago

also pushed to branch CIL@v23.1.1 for transparency/reproducibility