update build recipe

scilus · Nov 26, 2024 · 02e15d6 · 02e15d6
1 parent 0b107dc
commit 02e15d6
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/.github/workflows/actions-runner-builder.yml b/.github/workflows/actions-runner-builder.yml
@@ -7,7 +7,9 @@ on:
 
 jobs:
   compute-dependencies-versions:
-    runs-on: scilus-org-runners
+    runs-on: ubuntu-latest
+    container:
+      image: scilus/actions-runner:latest
     outputs:
       runner_current_version: ${{ steps.github-runner.outputs.current_version }}
       runner_latest_version: ${{ steps.github-runner.outputs.latest_version }}

diff --git a/.github/workflows/docker-builder.yml b/.github/workflows/docker-builder.yml
@@ -125,6 +125,10 @@ on:
         required: false
         type: string
         default: main
+      runner-image:
+        required: false
+        type: string
+        default: ubuntu-latest
     secrets:
       DOCKER_USERNAME:
         description: 'Image repository on dockerhub to which to push'
@@ -135,7 +139,7 @@ on:
 
 jobs:
   build-container:
-    runs-on: scilus-docker-builders
+    runs-on: ${{ inputs.runner-image && inputs.runner-image || 'ubuntu-latest' }}
     steps:
       -
         name: Validate input parameters

diff --git a/containers/ants.Dockerfile b/containers/ants.Dockerfile
@@ -24,8 +24,7 @@ WORKDIR /ants_build
 RUN mkdir build
 
 WORKDIR /ants_build/build
-RUN ls && mkdir build && \
-    cmake -DBUILD_SHARED_LIBS=OFF \
+RUN cmake -DBUILD_SHARED_LIBS=OFF \
           -DUSE_VTK=OFF \
           -DSuperBuild_ANTS_USE_GIT_PROTOCOL=OFF \
           -DBUILD_TESTING=OFF \
@@ -39,7 +38,7 @@ RUN ls && mkdir build && \
         { make -j $(nproc --all); } || \
         { make -j ${ANTS_BUILD_NTHREADS}; }
 
-WORKDIR /ants_build/build
+WORKDIR /ants_build/build/ANTS-build
 RUN make install
 
 FROM ants-base as ants-install
@@ -53,12 +52,14 @@ ENV ANTS_REVISION=${ANTS_REVISION:-v2.3.4}
 ENV ANTSPATH=${ANTS_INSTALL_PATH}/bin/
 ENV PATH=$PATH:$ANTSPATH
 
+COPY --from=ants --link ${ANTS_INSTALL_PATH} ${ANTS_INSTALL_PATH}
+
 RUN --mount=type=cache,sharing=locked,target=/var/cache/apt \
     apt-get update && apt-get -y install \
         zlib1g-dev && \
     rm -rf /var/lib/apt/lists/*
 
-COPY --from=ants --link ${ANTS_INSTALL_PATH} ${ANTS_INSTALL_PATH}
+
 
 WORKDIR /
 RUN ( [ -f "VERSION" ] || touch VERSION ) && \

diff --git a/containers/dmriqcpy.context/dmriqcpy.Dockerfile b/containers/dmriqcpy.context/dmriqcpy.Dockerfile
@@ -17,6 +17,8 @@ ENV LC_ALL="en_US.UTF-8"
 ENV LANG="en_US.UTF-8"
 ENV LANGUAGE="en_US.UTF-8"
 
+ENV SETUPTOOLS_USE_DISTUTILS=stdlib
+
 WORKDIR /
 RUN --mount=type=cache,sharing=locked,target=/var/cache/apt \
     apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \

diff --git a/containers/mrtrix.Dockerfile b/containers/mrtrix.Dockerfile
@@ -22,13 +22,9 @@ RUN --mount=type=cache,sharing=locked,target=/var/cache/apt \
         zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /
 ADD https://github.com/MRtrix3/mrtrix3.git#${MRTRIX_REVISION} /mrtrix3
 
 WORKDIR /mrtrix3
-RUN git fetch --tags && \
-    git checkout tags/${MRTRIX_VERSION} -b ${MRTRIX_VERSION}
-
 RUN ./configure -nogui && \
     [ -z "$MRTRIX_BUILD_NTHREADS" ] && \
         { NUMBER_OF_PROCESSORS=$(nproc --all) ./build; } || \

diff --git a/containers/scilpy.context/scilpy.Dockerfile b/containers/scilpy.context/scilpy.Dockerfile
@@ -19,6 +19,8 @@ ENV LC_ALL="en_US.UTF-8"
 ENV LANG="en_US.UTF-8"
 ENV LANGUAGE="en_US.UTF-8"
 
+ENV SETUPTOOLS_USE_DISTUTILS=stdlib
+
 WORKDIR /
 RUN --mount=type=cache,sharing=locked,target=/var/cache/apt \
     apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -41,8 +43,9 @@ WORKDIR /
 ADD https://github.com/scilus/scilpy.git#${SCILPY_REVISION} /scilpy
 
 WORKDIR /scilpy
-RUN SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL=True python${PYTHON_VERSION} -m pip install -e . && \
-    python${PYTHON_VERSION} -m pip install pyopencl==2023.1.3 && \
+RUN python${PYTHON_VERSION} -m pip install "packaging<22.0" "setuptools<=70.0" && \
+    SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL=True python${PYTHON_VERSION} -m pip install \
+        pyopencl==2023.1.3 -e . && \
     python${PYTHON_VERSION} -m pip cache purge
 
 RUN sed -i '41s/.*/backend : Agg/' /usr/local/lib/python${PYTHON_VERSION}/${PYTHON_PACKAGE_DIR}/matplotlib/mpl-data/matplotlibrc && \

diff --git a/versioning.hcl b/versioning.hcl
@@ -8,7 +8,7 @@ actions-runner-version="2.319.1"
 dmriqcpy-revision="0.1.7"
 scilpy-revision="2.0.2"
 
-ants-revision="2.4.3"
+ants-revision="v2.4.3"
 cmake-revision="v3.21.6"
 fsl-version="6.0.6.4"
 fsl-installer-version="3.14.0"
@@ -29,4 +29,4 @@ register-flow-version = "0.1.0"
 disconets-flow-version = "0.1.0-rc1"
 freewater-flow-version = "1.0.1"
 noddi-flow-version = "1.0.0"
-bst-flow-version = "1.0.0"
+bst-flow-version = "1.0.0"