Merge pull request #1210 from thewtex/dev-docker-tag

dev docker tag

Author: thewtex

examples/debugging/package.json

@@ -6,13 +6,13 @@
     "build": "npm run native-build && npm run emscripten-build-release && npm run emscripten-build-debug && npm run wasi-build-release && npm run wasi-build-debug",
     "native-build": "cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Debug && cmake --build build/ --config Debug",
     "native-debug-linux": "gdb --args ./build/DebugMe",
-    "emscripten-build-release": "itk-wasm --build-dir emscripten-build-release build",
+    "emscripten-build-release": "itk-wasm -i itkwasm/emscripten:latest --build-dir emscripten-build-release build",
     "run-node-release": "node ./runEmscriptenNode.js ./emscripten-build-release/DebugMe",
-    "emscripten-build-debug": "itk-wasm --build-dir emscripten-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
+    "emscripten-build-debug": "itk-wasm -i itkwasm/emscripten:latest-debug --build-dir emscripten-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
     "run-node-debug": "node ./runEmscriptenNode.js ./emscripten-build-debug/DebugMe",
     "wasi-build-release": "itk-wasm -i itkwasm/wasi:latest --build-dir wasi-build-release build",
     "node-inspect": "node --inspect-brk ./runEmscriptenNode.js ./emscripten-build-debug/DebugMe",
-    "wasi-build-debug": "itk-wasm -i itkwasm/wasi --build-dir wasi-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
+    "wasi-build-debug": "itk-wasm -i itkwasm/wasi:latest-debug --build-dir wasi-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
     "run-wasi-debug": "itk-wasm --build-dir wasi-build-debug run DebugMe.wasi.wasm",
     "start": "http-server -o"
   },

examples/inputs-outputs/package.json

@@ -36,8 +36,8 @@
     "test:python:dispatch": "itk-wasm pnpm-script test:python:emscripten",
     "test:python": "itk-wasm pnpm-script test:python",
     "test": "pnpm test:wasi && pnpm test:wasi:help",
-    "test:wasi": "itk-wasm -b wasi-build run inputs-outputs.wasi.wasm -- -- cthead1.png smoothed.png",
-    "test:wasi:help": "itk-wasm -b wasi-build run inputs-outputs.wasi.wasm -- -- --help"
+    "test:wasi": "itk-wasm -i itkwasm/wasi:latest -b wasi-build run inputs-outputs.wasi.wasm -- -- cthead1.png smoothed.png",
+    "test:wasi:help": "itk-wasm -i itkwasm/wasi:latest -b wasi-build run inputs-outputs.wasi.wasm -- -- --help"
   },
   "author": "Matt McCormick <[email protected]>",
   "license": "Apache-2.0",

examples/mean-squares-versor-registration/package.json

@@ -37,7 +37,7 @@
     "test:python": "itk-wasm pnpm-script test:python",
     "test": "pnpm test:wasi:help",
     "test:wasi:long": "itk-wasm test -- -- -V",
-    "test:wasi:help": "itk-wasm run mean-squares-versor-registration.wasi.wasm -- -- --help"
+    "test:wasi:help": "itk-wasm -i itkwasm/wasi:latest run mean-squares-versor-registration.wasi.wasm -- -- --help"
   },
   "author": "Matt McCormick <[email protected]>",
   "license": "Apache-2.0",

itk_wasm_env.bash

@@ -10,6 +10,8 @@ if test "$OSTYPE" = "cygwin" || test "$OSTYPE" = "msys" || test "$OSTYPE" = "win
     export CXXFLAGS="/Zc:__cplusplus /Zc:preprocessor /DNOMINMAX"
 fi
 
+export ITK_WASM_DEV_DOCKER_TAG=${ITK_WASM_DEV_DOCKER_TAG:-$(echo $(date '+%Y%m%d')-$(git rev-parse --short HEAD))}
+
 export ITK_WASM_DCMTK_REPOSITORY=${ITK_WASM_DCMTK_REPOSITORY:-"https://github.com/InsightSoftwareConsortium/DCMTK"}
 export ITK_WASM_DCMTK_GIT_TAG=${ITK_WASM_DCMTK_GIT_TAG:-"93e6d1b20b476c388f0379245c8c6e96af7f16f4"}
 

packages/core/typescript/itk-wasm/package.json

@@ -43,9 +43,9 @@
     "test:buildTestPipelines:emscripten": "node src/itk-wasm-cli.js -i itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines build",
     "test:buildTestPipelines:wasi": "node src/itk-wasm-cli.js -i itkwasm/wasi:latest -b wasi-build -s ./test/pipelines build",
     "test:buildTestPipelines:wasi:debug": "node src/itk-wasm-cli.js -i itkwasm/wasi:latest-debug -b wasi-build -s ./test/pipelines build -- -DCMAKE_BUILD_TYPE=Debug",
-    "test:runTestPipelines": "node src/itk-wasm-cli.js -b wasi-build -s ./test/pipelines run -r wasmtime stdout-stderr-pipeline/stdout-stderr-test.wasi.wasm",
-    "test:bindgenTestPipelines:typescript": "node src/itk-wasm-cli.js -b emscripten-build -s ./test/pipelines/ bindgen --package-version 1.0.0 --package-name test-pipelines --package-description \"Exercise interface types for bindgen\"",
-    "test:bindgenTestPipelines:python": "node src/itk-wasm-cli.js -b wasi-build -s ./test/pipelines/ bindgen --interface python --package-version 1.0.0 --package-name test-pipelines --package-description \"Exercise interface types for bindgen\"",
+    "test:runTestPipelines": "node src/itk-wasm-cli.js -i itkwasm/wasi:latest -b wasi-build -s ./test/pipelines run -r wasmtime stdout-stderr-pipeline/stdout-stderr-test.wasi.wasm",
+    "test:bindgenTestPipelines:typescript": "node src/itk-wasm-cli.js -i itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines/ bindgen --package-version 1.0.0 --package-name test-pipelines --package-description \"Exercise interface types for bindgen\"",
+    "test:bindgenTestPipelines:python": "node src/itk-wasm-cli.js -i itkwasm/wasi:latest -b wasi-build -s ./test/pipelines/ bindgen --interface python --package-version 1.0.0 --package-name test-pipelines --package-description \"Exercise interface types for bindgen\"",
     "test:browser:debug": "start-server-and-test start http-get://localhost:5180 cypress:open",
     "test:cypress": "start-server-and-test start http-get://localhost:5180 cypress:run",
     "test:browser:chrome": "start-server-and-test start http-get://localhost:5180 cypress:runChrome",

packages/core/typescript/itk-wasm/src/cli/default-image-tag.js

@@ -1,2 +1,2 @@
-const defaultImageTag = '20240822-c390b350'
+const defaultImageTag = '20240825-1a89d0e6'
 export default defaultImageTag

packages/core/typescript/itk-wasm/src/cli/pnpm-script.js

@@ -193,6 +193,13 @@ async function pnpmScript(name, extraArgs, options) {
           undefined,
           true
         )
+        const emscriptenDockerImage =
+          configValue(
+            'emscripten-docker-image',
+            options,
+            packageJson,
+            undefined
+          ) ?? `quay.io/itkwasm/emscripten:${defaultImageTag}`
         const packageDescription = configValue(
           'package-description',
           options,
@@ -204,6 +211,8 @@ async function pnpmScript(name, extraArgs, options) {
           'itk-wasm',
           '-b',
           'emscripten-build',
+          '-i',
+          emscriptenDockerImage,
           'bindgen',
           '--interface',
           'typescript',
@@ -247,10 +256,15 @@ async function pnpmScript(name, extraArgs, options) {
           undefined,
           true
         )
+        const wasiDockerImage =
+          configValue('wasi-docker-image', options, packageJson, undefined) ??
+          `quay.io/itkwasm/wasi:${defaultImageTag}`
         pnpmCommand = pnpmCommand.concat([
           'itk-wasm',
           '-b',
           'wasi-build',
+          '-i',
+          wasiDockerImage,
           'bindgen',
           '--interface',
           'python',

packages/dicom/python/itkwasm-dicom-emscripten/itkwasm_dicom_emscripten/js_package.py

@@ -6,8 +6,8 @@
   "description": "scripts to generate @itk-wasm/transform-io itk-wasm artifacts.",
   "type": "module",
   "itk-wasm": {
-    "emscripten-docker-transform": "itkwasm/emscripten:latest",
-    "wasi-docker-transform": "itkwasm/wasi:latest",
+    "emscripten-docker-image": "itkwasm/emscripten:latest",
+    "wasi-docker-image": "itkwasm/wasi:latest",
     "typescript-package-name": "@itk-wasm/transform-io",
     "python-package-name": "itkwasm-transform-io",
     "package-description": "Input and output for scientific and medical coordinate transform file formats.",

packages/transform-io/package.json

@@ -36,7 +36,7 @@ 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"
+cmd = "sed -i \"s/const defaultImageTag = '.*'/const defaultImageTag = '$ITK_WASM_DEV_DOCKER_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"