build: re-use ITK, DCMTK source locations in native, docker builds

Also add the ability to drive via pixi.

Author: thewtex

.gitignore

@@ -102,4 +102,4 @@ packages/transform-io/typescript/demo-app/
 *.egg-info
 
 native/
-
+src/docker/itk-wasm-base/itk_wasm_env_vars.sh

docs/development/hacking_itk_wasm.md

@@ -69,7 +69,7 @@ To pull the `latest` the build environment Docker images,
 To build the `latest` build environment Docker images from the Docker configuration and local C++ core,
 
 ```sh
-./src/docker/build.sh --with-debug
+pixi run build-docker-images --with-debug
 ```
 
 The `--with-debug` flag will also build the `latest-debug` tagged images.
@@ -242,4 +242,4 @@ and rebuild whenever the documentation changes.
 [standard GitHub contribution best practices]: https://docs.itk.org/en/latest/contributing/index.html
 [web3.storage]: https://web3.storage/
 [Windows Git Bash]: https://gitforwindows.org/
-[WSL]: https://learn.microsoft.com/en-us/windows/wsl/install
+[WSL]: https://learn.microsoft.com/en-us/windows/wsl/install

itk_wasm_env.bash

@@ -5,7 +5,7 @@ function die() {
     exit 1
 }
 
-if [$OSTYPE == "cygwin"] || [$OSTYPE == "msys"] || [$OSTYPE =="win32"]; then
+if test "$OSTYPE" = "cygwin" || test "$OSTYPE" = "msys" || test "$OSTYPE" = "win32"; then
     echo "Windows platform detected ... adding \"/Zc:__cplusplus /DNOMINMAX\" to \$CXXFLAGS"
     export CXXFLAGS="/Zc:__cplusplus /DNOMINMAX"
 fi
@@ -27,4 +27,4 @@ export ITK_WASM_DICOM_TEST_DATA_HASH=${ITK_WASM_DICOM_TEST_DATA_HASH:-$(cat pack
 export ITK_WASM_DICOM_TEST_DATA_URLS=${ITK_WASM_DICOM_TEST_DATA_URLS:-$(cat packages/dicom/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}
 
 export ITK_WASM_MESH_IO_TEST_DATA_HASH=${ITK_WASM_MESH_IO_TEST_DATA_HASH:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-hash"')}
-export ITK_WASM_MESH_IO_TEST_DATA_URLS=${ITK_WASM_MESH_IO_TEST_DATA_URLS:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}
+export ITK_WASM_MESH_IO_TEST_DATA_URLS=${ITK_WASM_MESH_IO_TEST_DATA_URLS:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}

pixi.toml

@@ -29,6 +29,22 @@ depends-on = ["pnpm-install"]
 outputs = ["packages/mesh-io/test/data.tar.gz"]
 description = "Download mesh-io test data"
 
+[tasks.export-itk-wasm-env-vars]
+cmd = "bash -c ./itk_wasm_env.bash && env | grep ITK_WASM | grep -v TEST > ./src/docker/itk-wasm-base/itk_wasm_env_vars.sh"
+outputs = ["src/docker/itk-wasm-base/itk_wasm_env_vars.*"]
+inputs = ["itk_wasm_env.*"]
+description = "Provide ITK_WASM environmental variables to the Docker image"
+
+[tasks.update-default-image-tag]
+cmd = "sed -i \"s/const defaultImageTag = '.*'/const defaultImageTag = '$new_tag'/g\" packages/core/typescript/itk-wasm/src/cli/default-image-tag.js"
+outputs = ["packages/core/typescript/itk-wasm/src/cli/default-image-tag.*"]
+description = "Update the default Docker image tag"
+
+[tasks.build-docker-images]
+cmd = "src/docker/build.sh"
+description = "Build the ITK-Wasm docker images"
+depends-on = ["clean", "export-itk-wasm-env-vars", "update-default-image-tag"]
+
 [dependencies]
 pnpm = ">=9.7.1,<10"
 nodejs = ">=22.6.0,<23"

src/docker/itk-wasm-base/Dockerfile

@@ -7,6 +7,8 @@ LABEL org.opencontainers.image.source="https://github.com/InsightSoftwareConsort
 
 WORKDIR /
 
+COPY itk_wasm_env_vars.sh /
+
 # Note: on entry, emsdk will prepend to the path with its own node, so add to an earlier path
 ENV NODE_TAG v20.12.2
 RUN curl -LO https://nodejs.org/dist/${NODE_TAG}/node-${NODE_TAG}-linux-x64.tar.xz && \
@@ -33,19 +35,16 @@ RUN curl -L https://github.com/api/repos/facebook/zstd/tarball/${zstd_GIT_TAG} |
   cd .. && \
   rm -rf zstd-build zstd
 
-# tag commit date: 2024-08-16
-ENV ITK_GIT_TAG eddb514e52a23e2b0987b71fda59780c6ad209ab
-ENV ITK_GIT_BRANCH itkwasm-2024-05-20-5db055d7ad3b-3
-RUN git clone --branch $ITK_GIT_BRANCH --single-branch --depth 1 https://github.com/KitwareMedical/ITK.git && \
+RUN . /itk_wasm_env_vars.sh && git clone --branch $ITK_WASM_ITK_BRANCH --single-branch --depth 1 $ITK_WASM_ITK_REPOSITORY && \
   sed -i -e '/^option(OPJ_USE_THREAD/c\option(OPJ_USE_THREAD "use threads" OFF)' \
     /ITK/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/CMakeLists.txt
 
 # Modify CMake variable to use patched DCMTK library
 # GIT_TAG refers to DCMTK branch: 20240311_DCMTK_PATCHES_FOR_ITK-Wasm-1
-RUN sed -i -e '/^set(DCMTK_GIT_REPOSITORY/c\set(DCMTK_GIT_REPOSITORY "https://github.com/InsightSoftwareConsortium/DCMTK.git")' \
+RUN . /itk_wasm_env_vars.sh && sed -i -e "/^set(DCMTK_GIT_REPOSITORY/c\set(DCMTK_GIT_REPOSITORY \"${ITK_WASM_DCMTK_REPOSITORY}\")" \
     /ITK/Modules/ThirdParty/DCMTK/DCMTKGitTag.cmake
 
-RUN sed -i -e '/^set(DCMTK_GIT_TAG/c\set(DCMTK_GIT_TAG "93e6d1b20b476c388f0379245c8c6e96af7f16f4")' \
+RUN . /itk_wasm_env_vars.sh && sed -i -e "/^set(DCMTK_GIT_TAG/c\set(DCMTK_GIT_TAG \"${ITK_WASM_DCMTK_GIT_TAG}\")" \
     /ITK/Modules/ThirdParty/DCMTK/DCMTKGitTag.cmake
 
 RUN if test -e $WASI_SDK_PATH/share/cmake/wasi-sdk.cmake; then sed -i '/cmake_minimum_required/d' $WASI_SDK_PATH/share/cmake/wasi-sdk.cmake; fi