Merge pull request #1079 from thewtex/die-process

thewtex · web-flow · commit 6f960f640773 · 2024-03-04T20:34:46.000-05:00
Die process
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -55,7 +55,7 @@ jobs:
 
     - name: Pull latest Docker images
       run: |
-        ./src/docker/pull.sh
+        ./src/docker/pull.sh --no-debug
 
     - uses: actions/setup-node@v4
       with:
diff --git a/.github/workflows/javascript-typescript.yml b/.github/workflows/javascript-typescript.yml
@@ -22,7 +22,7 @@ jobs:
 
     - name: Pull latest Docker images
       run: |
-        ./src/docker/pull.sh
+        ./src/docker/pull.sh --no-debug
 
     - uses: actions/setup-node@v4
       with:
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -20,4 +20,4 @@ jobs:
           pnpm i
 
       - name: Lint commits
-        run: pnpx commitlint --from=${{ github.event.pull_request.base.sha }}
+        run: npx commitlint --from=${{ github.event.pull_request.base.sha }}
diff --git a/.github/workflows/toolchains.yml b/.github/workflows/toolchains.yml
@@ -15,7 +15,7 @@ jobs:
 
     - name: Pull latest Docker images
       run: |
-        ./src/docker/pull.sh
+        ./src/docker/pull.sh --no-debug
 
     - uses: actions/download-artifact@v4
       continue-on-error: true
@@ -57,7 +57,7 @@ jobs:
 
     - name: Pull latest Docker images
       run: |
-        ./src/docker/pull.sh
+        ./src/docker/pull.sh --no-debug
 
     - uses: actions/download-artifact@v4
       continue-on-error: true
diff --git a/.github/workflows/wasi.yml b/.github/workflows/wasi.yml
@@ -18,7 +18,7 @@ jobs:
 
     - name: Pull latest Docker images
       run: |
-        ./src/docker/pull.sh
+        ./src/docker/pull.sh --no-debug
 
     - uses: actions/setup-node@v4
       with:
diff --git a/docs/development/hacking_itk_wasm.md b/docs/development/hacking_itk_wasm.md
@@ -67,10 +67,8 @@ To prevent Git repository bloat, we add testing data through [CMake content link
 
 ## Build environment Docker images
 
-Builds of the [wasm build environment Docker images](../introduction/parts.md#docker) or WebAssembly modules require [Podman (recommended)](https://podman.io/docs/installation) or [Docker](https://docs.docker.com/install/).
-
-* On Linux, make sure you can run [`podman` or `docker` without `sudo`](https://askubuntu.com/questions/477551/how-can-i-use-docker-without-sudo).
-* On Windows, we highly recommend [Podman](https://podman.io/docs/installation).
+Builds of the [wasm build environment Docker images](../introduction/parts.md#docker) or WebAssembly modules require [Podman](https://podman.io/docs/installation).
+*Note*: on Linux, ensure the [`vfs` podman storage driver is not used for best performance](https://github.com/containers/podman/issues/13226#issuecomment-1555872420).
 
 To pull the `latest` the build environment Docker images,
 
diff --git a/docs/typescript/distribution/umd.md b/docs/typescript/distribution/umd.md
@@ -88,8 +88,8 @@ Then, specify npm scripts to develop and debug the tests and run them in an auto
 ```js
   "scripts": {
     "start": "http-server ./dist/"
-    "cypress:open": "pnpx cypress open",
-    "cypress:run": "pnpx cypress run",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:run": "pnpm exec cypress run",
     "test:debug": "start-server-and-test start http://localhost:8080 cypress:open",
     "test": "start-server-and-test start http://localhost:8080 cypress:run"
   },
diff --git a/docs/typescript/distribution/webpack.md b/docs/typescript/distribution/webpack.md
@@ -173,8 +173,8 @@ Then, specify npm scripts to develop and debug the tests and run them in an auto
 ```js
   "scripts": {
     "start": "webpack-dev-server --mode development --static ./dist/",
-    "cypress:open": "pnpx cypress open",
-    "cypress:run": "pnpx cypress run",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:run": "pnpm exec cypress run",
     "test:debug": "start-server-and-test start http-get://localhost:8080 cypress:open",
     "test": "start-server-and-test start http-get://localhost:8080 cypress:run"
   },
diff --git a/examples/hello-world/package.json b/examples/hello-world/package.json
@@ -11,8 +11,8 @@
     "test": "npm run test:wasi && npm run test:node && npm run test:browser",
     "test:wasi": "npx itk-wasm run wasi-build/hello.wasi.wasm",
     "test:node": "node ./index.mjs",
-    "cypress:open": "pnpx cypress open",
-    "cypress:run": "pnpx cypress run",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:run": "pnpm exec cypress run",
     "start": "http-server -p 8083",
     "test:browser": "start-server-and-test start http://localhost:8083 cypress:run"
   },
diff --git a/examples/umd/package.json b/examples/umd/package.json
@@ -4,8 +4,8 @@
   "description": "This example demonstrates how to use the itk-wasm UMD module from an HTML script tag.",
   "scripts": {
     "start": "http-server ./dist/",
-    "cypress:open": "pnpx cypress open",
-    "cypress:run": "pnpx cypress run",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:run": "pnpm exec cypress run",
     "test:debug": "start-server-and-test start http://localhost:8080 cypress:open",
     "test": "start-server-and-test start http://localhost:8080 cypress:run"
   },
diff --git a/examples/vite/package.json b/examples/vite/package.json
@@ -7,10 +7,10 @@
     "start": "vite --port 8085",
     "build": "vite build",
     "start:production": "vite preview --port 8085",
-    "cypress:open": "pnpx cypress open",
-    "cypress:run": "pnpx cypress run",
-    "cypress:runChrome": "pnpx cypress run --browser chrome",
-    "cypress:runFirefox": "pnpx cypress run --browser firefox",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:run": "pnpm exec cypress run",
+    "cypress:runChrome": "pnpm exec cypress run --browser chrome",
+    "cypress:runFirefox": "pnpm exec cypress run --browser firefox",
     "test:debug": "start-server-and-test start http-get://localhost:8085 cypress:open",
     "test": "start-server-and-test start:production http-get://localhost:8085 cypress:run",
     "test:chrome": "start-server-and-test start:production http-get://localhost:8085 cypress:runChrome",
diff --git a/examples/webpack/package.json b/examples/webpack/package.json
@@ -7,12 +7,12 @@
     "build": "webpack --progress --color --mode production",
     "start": "webpack-dev-server --port 8686 --mode development --static ./dist/",
     "start:production": "webpack-dev-server --port 8686 --mode production --static ./dist/",
-    "cypress:open": "pnpx cypress open",
-    "cypress:run": "pnpx cypress run --config defaultCommandTimeout=8000",
-    "cypress:install": "pnpx cypress install",
-    "cypress:runChrome": "pnpx cypress run --config defaultCommandTimeout=8000 --browser chrome",
-    "cypress:runFirefox": "pnpx cypress run --config defaultCommandTimeout=8000 --browser firefox",
-    "cypress:runFirefox:ci": "npm run cypress:install && pnpx cypress run --config defaultCommandTimeout=8000 --browser firefox",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:run": "pnpm exec cypress run --config defaultCommandTimeout=8000",
+    "cypress:install": "pnpm exec cypress install",
+    "cypress:runChrome": "pnpm exec cypress run --config defaultCommandTimeout=8000 --browser chrome",
+    "cypress:runFirefox": "pnpm exec cypress run --config defaultCommandTimeout=8000 --browser firefox",
+    "cypress:runFirefox:ci": "npm run cypress:install && pnpm exec cypress run --config defaultCommandTimeout=8000 --browser firefox",
     "test:debug": "start-server-and-test start http-get://localhost:8686 cypress:open",
     "test": "start-server-and-test start:production http-get://localhost:8686 cypress:run",
     "test:chrome": "start-server-and-test start:production http-get://localhost:8686 cypress:runChrome",
diff --git a/packages/compare-images/typescript/package.json b/packages/compare-images/typescript/package.json
@@ -22,9 +22,9 @@
     "test:browser:firefox": "start-server-and-test start http-get://localhost:5175 cypress:runFirefox",
     "test:browser:chrome": "start-server-and-test start http-get://localhost:5175 cypress:runChrome",
     "test:browser:debug": "start-server-and-test start http-get://localhost:5175 cypress:open",
-    "cypress:open": "pnpx cypress open",
-    "cypress:runChrome": "pnpx cypress run --browser chrome",
-    "cypress:runFirefox": "pnpx cypress run --browser firefox",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:runChrome": "pnpm exec cypress run --browser chrome",
+    "cypress:runFirefox": "pnpm exec cypress run --browser firefox",
     "build": "pnpm build:tsc && pnpm build:browser:workerEmbedded && pnpm build:browser:workerEmbeddedMin && pnpm build:demo",
     "build:browser:workerEmbedded": "esbuild --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.js ./src/index-worker-embedded.ts",
     "build:browser:workerEmbeddedMin": "esbuild --minify --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.min.js ./src/index-worker-embedded.min.ts",
diff --git a/packages/compress-stringify/typescript/package.json b/packages/compress-stringify/typescript/package.json
@@ -23,9 +23,9 @@
     "test:browser:chrome": "start-server-and-test start http-get://localhost:5176 cypress:runChrome",
     "test:browser:debug": "start-server-and-test start http-get://localhost:5176 cypress:open",
     "copyShoelaceAssets": "shx mkdir -p test/browser/demo-app/public/shoelace && shx cp -r node_modules/@shoelace-style/shoelace/dist/assets test/browser/demo-app/public/",
-    "cypress:open": "pnpx cypress open",
-    "cypress:runChrome": "pnpx cypress run --browser chrome",
-    "cypress:runFirefox": "pnpx cypress run --browser firefox",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:runChrome": "pnpm exec cypress run --browser chrome",
+    "cypress:runFirefox": "pnpm exec cypress run --browser firefox",
     "build": "pnpm build:tsc && pnpm build:browser:workerEmbedded && pnpm build:browser:workerEmbeddedMin && pnpm build:demo",
     "build:browser:workerEmbedded": "esbuild --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.js ./src/index-worker-embedded.ts",
     "build:browser:workerEmbeddedMin": "esbuild --minify --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.min.js ./src/index-worker-embedded.min.ts",
diff --git a/packages/core/typescript/create-itk-wasm/package.json b/packages/core/typescript/create-itk-wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-itk-wasm",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "CLI to create a new ITK-Wasm project or add a pipeline to an existing project.",
   "type": "module",
   "exports": {
diff --git a/packages/core/typescript/create-itk-wasm/src/generate/package-json.ts b/packages/core/typescript/create-itk-wasm/src/generate/package-json.ts
@@ -59,7 +59,7 @@ function generatePackageJson(project: ProjectSpec) {
     devDependencies: {
       '@itk-wasm/dam': '^1.1.1',
       '@thewtex/setup-micromamba': '^1.9.7',
-      'itk-wasm': '1.0.0-b.167'
+      'itk-wasm': '1.0.0-b.169'
     }
   }
   if (project.author) {
diff --git a/packages/core/typescript/itk-wasm/package.json b/packages/core/typescript/itk-wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "itk-wasm",
-  "version": "1.0.0-b.168",
+  "version": "1.0.0-b.169",
   "packageManager": "pnpm@8.11.0",
   "description": "High-performance spatial analysis in a web browser, Node.js, and reproducible execution across programming languages and hardware architectures.",
   "type": "module",
@@ -26,12 +26,12 @@
     "build:workerBundle": "esbuild --bundle --format=esm --outfile=./dist/pipeline/web-workers/bundles/itk-wasm-pipeline.worker.js ./dist/pipeline/web-workers/itk-wasm-pipeline.worker.js",
     "build:workerBundleForTesting": "esbuild --bundle --format=esm --outfile=./test/pipelines/typescript/test/browser/demo-app/public/itk-wasm-pipeline.worker.js ./dist/pipeline/web-workers/itk-wasm-pipeline.worker.js && shx cp -r ./test/data/ ./test/pipelines/typescript/test/browser/demo-app/public/",
     "build:workerMinBundle": "esbuild --minify --bundle --format=esm --outfile=./dist/pipeline/web-workers/bundles/itk-wasm-pipeline.min.worker.js ./dist/pipeline/web-workers/itk-wasm-pipeline.worker.js",
-    "cypress:open": "pnpx cypress open",
-    "cypress:run": "pnpx cypress run --config defaultCommandTimeout=8000",
-    "cypress:install": "pnpx cypress install",
-    "cypress:runChrome": "pnpx cypress run --config defaultCommandTimeout=8000 --browser chrome",
-    "cypress:runFirefox": "pnpx cypress run --config defaultCommandTimeout=8000 --browser firefox",
-    "cypress:runFirefox:ci": "pnpm cypress:install && pnpx cypress run --config defaultCommandTimeout=8000 --browser firefox",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:run": "pnpm exec cypress run --config defaultCommandTimeout=8000",
+    "cypress:install": "pnpm exec cypress install",
+    "cypress:runChrome": "pnpm exec cypress run --config defaultCommandTimeout=8000 --browser chrome",
+    "cypress:runFirefox": "pnpm exec cypress run --config defaultCommandTimeout=8000 --browser firefox",
+    "cypress:runFirefox:ci": "pnpm cypress:install && pnpm exec cypress run --config defaultCommandTimeout=8000 --browser firefox",
     "start": "pnpm build:workerBundleForTesting && cd test/pipelines/typescript && npm i && npm link ../../.. && npm run build && npm run start",
     "test:wasi": "pnpm test:buildTestPipelines:wasi && pnpm test:runTestPipelines && pnpm test:bindgenTestPipelines:python",
     "test": "pnpm test:lint && pnpm test:testPipelines && pnpm test:node && pnpm test:bindgenTestPipelines:python && pnpm test:browser:chrome && pnpm test:browser:firefox",
diff --git a/packages/core/typescript/itk-wasm/src/cli/default-image-tag.js b/packages/core/typescript/itk-wasm/src/cli/default-image-tag.js
@@ -1,2 +1,2 @@
-const defaultImageTag = '20231217-40780708'
+const defaultImageTag = '20240303-290bbfb2'
 export default defaultImageTag
diff --git a/packages/core/typescript/itk-wasm/src/cli/process-common-options.js b/packages/core/typescript/itk-wasm/src/cli/process-common-options.js
@@ -4,17 +4,18 @@ import { spawnSync } from 'child_process'
 
 import defaultImageTag from './default-image-tag.js'
 import findOciExe from './find-oci-exe.js'
+import die from './die.js'
 
 function processCommonOptions(program, wasiDefault = false) {
   const options = program.opts()
 
   const ociExePath = findOciExe()
 
-  let dockerImage = `itkwasm/emscripten:${defaultImageTag}`
+  let dockerImage = `quay.io/itkwasm/emscripten:${defaultImageTag}`
   if (options.image) {
     dockerImage = options.image
     if (dockerImage === 'itkwasm/wasi') {
-      dockerImage = `itkwasm/wasi:${defaultImageTag}`
+      dockerImage = `quay.io/itkwasm/wasi:${defaultImageTag}`
     }
   }
 
diff --git a/packages/core/typescript/itk-wasm/src/version.ts b/packages/core/typescript/itk-wasm/src/version.ts
@@ -1,3 +1,3 @@
-const version = "1.0.0-b.167";
+const version = '1.0.0-b.167'
 
 export default version
diff --git a/packages/dicom/typescript/package.json b/packages/dicom/typescript/package.json
@@ -23,9 +23,9 @@
     "test:browser:chrome": "start-server-and-test start http-get://localhost:5177 cypress:runChrome",
     "test:browser:debug": "start-server-and-test start http-get://localhost:5177 cypress:open",
     "copyShoelaceAssets": "shx mkdir -p test/browser/demo-app/public/shoelace && shx cp -r node_modules/@shoelace-style/shoelace/dist/assets test/browser/demo-app/public/",
-    "cypress:open": "pnpx cypress open",
-    "cypress:runChrome": "pnpx cypress run --browser chrome",
-    "cypress:runFirefox": "pnpx cypress run --browser firefox",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:runChrome": "pnpm exec cypress run --browser chrome",
+    "cypress:runFirefox": "pnpm exec cypress run --browser firefox",
     "build": "pnpm build:tsc && pnpm build:browser:workerEmbedded && pnpm build:browser:workerEmbeddedMin && pnpm build:demo",
     "build:browser:workerEmbedded": "esbuild --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.js ./src/index-worker-embedded.ts",
     "build:browser:workerEmbeddedMin": "esbuild --minify --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.min.js ./src/index-worker-embedded.min.ts",
diff --git a/packages/downsample/typescript/package.json b/packages/downsample/typescript/package.json
@@ -22,9 +22,9 @@
     "test:browser:firefox": "start-server-and-test start http-get://localhost:5179 cypress:runFirefox",
     "test:browser:chrome": "start-server-and-test start http-get://localhost:5179 cypress:runChrome",
     "test:browser:debug": "start-server-and-test start http-get://localhost:5179 cypress:open",
-    "cypress:open": "pnpx cypress open",
-    "cypress:runChrome": "pnpx cypress run --browser chrome",
-    "cypress:runFirefox": "pnpx cypress run --browser firefox",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:runChrome": "pnpm exec cypress run --browser chrome",
+    "cypress:runFirefox": "pnpm exec cypress run --browser firefox",
     "build": "pnpm build:tsc && pnpm build:browser:workerEmbedded && pnpm build:browser:workerEmbeddedMin && pnpm build:demo",
     "build:browser:workerEmbedded": "esbuild --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.js ./src/index-worker-embedded.ts",
     "build:browser:workerEmbeddedMin": "esbuild --minify --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.min.js ./src/index-worker-embedded.min.ts",
diff --git a/packages/image-io/typescript/package.json b/packages/image-io/typescript/package.json
@@ -22,9 +22,9 @@
     "test:browser:firefox": "start-server-and-test vite:start http-get://localhost:5004 cypress:runFirefox",
     "test:browser:chrome": "start-server-and-test vite:start http-get://localhost:5004 cypress:runChrome",
     "test:browser:debug": "start-server-and-test rollup:start http-get://localhost:5004 cypress:open",
-    "cypress:open": "pnpx cypress open",
-    "cypress:runChrome": "pnpx cypress run --browser chrome",
-    "cypress:runFirefox": "pnpx cypress run --browser firefox",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:runChrome": "pnpm exec cypress run --browser chrome",
+    "cypress:runFirefox": "pnpm exec cypress run --browser firefox",
     "build": "pnpm build:tsc && pnpm build:browser:workerEmbedded && pnpm build:browser:workerEmbeddedMin && pnpm build:demo",
     "build:browser:workerEmbedded": "esbuild --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.js ./src/index-worker-embedded.ts",
     "build:browser:workerEmbeddedMin": "esbuild --minify --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.min.js ./src/index-worker-embedded.min.ts",
diff --git a/packages/mesh-io/typescript/package.json b/packages/mesh-io/typescript/package.json
@@ -22,9 +22,9 @@
     "test:browser:firefox": "start-server-and-test start http-get://localhost:5178 cypress:runFirefox",
     "test:browser:chrome": "start-server-and-test start http-get://localhost:5178 cypress:runChrome",
     "test:browser:debug": "start-server-and-test start http-get://localhost:5178 cypress:open",
-    "cypress:open": "pnpx cypress open",
-    "cypress:runChrome": "pnpx cypress run --browser chrome",
-    "cypress:runFirefox": "pnpx cypress run --browser firefox",
+    "cypress:open": "pnpm exec cypress open",
+    "cypress:runChrome": "pnpm exec cypress run --browser chrome",
+    "cypress:runFirefox": "pnpm exec cypress run --browser firefox",
     "build": "pnpm build:tsc && pnpm build:browser:workerEmbedded && pnpm build:browser:workerEmbeddedMin && pnpm build:demo",
     "build:browser:workerEmbedded": "esbuild --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.js ./src/index-worker-embedded.ts",
     "build:browser:workerEmbeddedMin": "esbuild --minify --loader:.worker.js=dataurl --bundle --format=esm --outfile=./dist/bundle/index-worker-embedded.min.js ./src/index-worker-embedded.min.ts",
diff --git a/src/docker/pull.sh b/src/docker/pull.sh
@@ -6,8 +6,22 @@ exe=$(ociExe)
 
 set -eo pipefail
 
-$exe pull itkwasm/emscripten:latest
-$exe pull itkwasm/emscripten:latest-debug
+debug=true
+for param; do
+  if [[ $param == '--no-debug' ]]; then
+    debug=false
+  else
+    newparams+=("$param")
+  fi
+done
+set -- "${newparams[@]}"  # overwrites the original positional params
 
-$exe pull itkwasm/wasi:latest
-$exe pull itkwasm/wasi:latest-debug
+$exe pull quay.io/itkwasm/emscripten:latest
+if $debug; then
+  $exe pull quay.io/itkwasm/emscripten:latest-debug
+fi
+
+$exe pull quay.io/itkwasm/wasi:latest
+if $debug; then
+  $exe pull quay.io/itkwasm/wasi:latest-debug
+fi
diff --git a/src/docker/push.sh b/src/docker/push.sh
@@ -26,12 +26,14 @@ function push_image() {
   local image=$1
   local tag=$2
   local debug=$3
-  $exe push ${image}:${tag}
-  $exe tag ${image}:${tag} quay.io/${image}:${tag}
+  $exe tag localhost/${image}:${tag} docker.io/${image}:${tag}
+  $exe push docker.io/${image}:${tag}
+  $exe tag localhost/${image}:${tag} quay.io/${image}:${tag}
   $exe push quay.io/${image}:${tag}
   if $debug; then
-    $exe push ${image}:${tag}-debug
-    $exe tag ${image}:${tag}-debug quay.io/${image}:${tag}-debug
+    $exe tag localhost/${image}:${tag}-debug docker.io/${image}:${tag}-debug
+    $exe push docker.io/${image}:${tag}-debug
+    $exe tag localhost/${image}:${tag}-debug quay.io/${image}:${tag}-debug
     $exe push quay.io/${image}:${tag}-debug
   fi
 }
