From 23b0c54b8718b9d61b9d8d8a945717534e8cb647 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 5 Dec 2024 12:19:29 -0500 Subject: [PATCH 01/11] docs(hacking-itk-wasm): run pull.sh script in quickstart Ensure we have fully qualified localhost latest images when we begin. --- docs/development/hacking_itk_wasm.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/development/hacking_itk_wasm.md b/docs/development/hacking_itk_wasm.md index 48c896f67..7bf95d3ce 100644 --- a/docs/development/hacking_itk_wasm.md +++ b/docs/development/hacking_itk_wasm.md @@ -5,6 +5,7 @@ Install [Podman] and [Pixi], and ```sh +./src/docker/pull.sh pixi run build pixi run test ``` From 2bf076951fb594868639e8a3e30e1b4248385085 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 5 Dec 2024 12:32:14 -0500 Subject: [PATCH 02/11] build(docker): use fully qualified images for monorepo package builds Avoid issues with unqualified-search-registries not set in /etc/containers/registries.conf, which is the default for some podman installations. Issue #1281. --- examples/debugging/package.json | 8 ++++---- examples/inputs-outputs/package.json | 4 ++-- .../mean-squares-versor-registration/package.json | 4 ++-- packages/compare-images/package.json | 4 ++-- packages/compare-meshes/package.json | 4 ++-- packages/compress-stringify/package.json | 4 ++-- packages/core/typescript/itk-wasm/package.json | 14 +++++++------- packages/dicom/package.json | 4 ++-- packages/downsample/package.json | 4 ++-- packages/image-io/package.json | 4 ++-- packages/mesh-io/package.json | 4 ++-- packages/transform-io/package.json | 4 ++-- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/examples/debugging/package.json b/examples/debugging/package.json index cd99088fb..07399ee2e 100644 --- a/examples/debugging/package.json +++ b/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 -i itkwasm/emscripten:latest --build-dir emscripten-build-release build", + "emscripten-build-release": "itk-wasm -i quay.io/itkwasm/emscripten:latest --build-dir emscripten-build-release build", "run-node-release": "node ./runEmscriptenNode.js ./emscripten-build-release/DebugMe", - "emscripten-build-debug": "itk-wasm -i itkwasm/emscripten:latest-debug --build-dir emscripten-build-debug build -- -DCMAKE_BUILD_TYPE=Debug", + "emscripten-build-debug": "itk-wasm -i quay.io/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", + "wasi-build-release": "itk-wasm -i quay.io/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:latest-debug --build-dir wasi-build-debug build -- -DCMAKE_BUILD_TYPE=Debug", + "wasi-build-debug": "itk-wasm -i quay.io/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" }, diff --git a/examples/inputs-outputs/package.json b/examples/inputs-outputs/package.json index 7c3e170a8..43f3375a7 100644 --- a/examples/inputs-outputs/package.json +++ b/examples/inputs-outputs/package.json @@ -5,8 +5,8 @@ "description": "An itk-wasm pipeline example for inputs/outputs", "type": "module", "itk-wasm": { - "emscripten-docker-image": "itkwasm/emscripten:latest", - "wasi-docker-image": "itkwasm/wasi:latest", + "emscripten-docker-image": "quay.io/itkwasm/emscripten:latest", + "wasi-docker-image": "quay.io/itkwasm/wasi:latest", "typescript-package-name": "@itk-wasm/inputs-outputs-example", "python-package-name": "itkwasm-inputs-outputs-example", "package-description": "An example that has non-trivial inputs and outputs.", diff --git a/examples/mean-squares-versor-registration/package.json b/examples/mean-squares-versor-registration/package.json index 7066e2a55..5606b17e8 100644 --- a/examples/mean-squares-versor-registration/package.json +++ b/examples/mean-squares-versor-registration/package.json @@ -5,8 +5,8 @@ "description": "Illustrate the use of the VersorRigid3DTransform for 3D image registration.", "type": "module", "itk-wasm": { - "emscripten-docker-image": "itkwasm/emscripten:latest", - "wasi-docker-image": "itkwasm/wasi:latest", + "emscripten-docker-image": "quay.io/itkwasm/emscripten:latest", + "wasi-docker-image": "quay.io/itkwasm/wasi:latest", "typescript-package-name": "@itk-wasm/mean-squares-versor-registration-example", "python-package-name": "itkwasm-mean-squares-versor-registration-example", "package-description": "Example 3D versor transform registration with a mean-squares similarity metric", diff --git a/packages/compare-images/package.json b/packages/compare-images/package.json index aa52b64fa..52bb3dd0e 100644 --- a/packages/compare-images/package.json +++ b/packages/compare-images/package.json @@ -5,8 +5,8 @@ "description": "@itk-wasm/compare-stringify build configuration", "type": "module", "itk-wasm": { - "emscripten-docker-image": "itkwasm/emscripten:latest", - "wasi-docker-image": "itkwasm/wasi:latest", + "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", + "wasi-docker-image": "localhost/itkwasm/wasi:latest", "test-data-hash": "bafybeiafli6egtmkcgany65po64w67hpqnmgwr5utqo6ycbbz7k5l33llu", "test-data-urls": [ "https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.171/compare-images-test-data.tar.gz" diff --git a/packages/compare-meshes/package.json b/packages/compare-meshes/package.json index d1d4ea3c8..0046b451e 100644 --- a/packages/compare-meshes/package.json +++ b/packages/compare-meshes/package.json @@ -5,8 +5,8 @@ "description": "@itk-wasm/compare-meshes build configuration.", "type": "module", "itk-wasm": { - "emscripten-docker-image": "itkwasm/emscripten:latest", - "wasi-docker-image": "itkwasm/wasi:latest", + "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", + "wasi-docker-image": "localhost/itkwasm/wasi:latest", "test-data-hash": "bafkreibsonywg3w3gscmookip3elsyydfsn2cbubk6dukatkmjgeguhiri", "test-data-urls": [ "https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.178/compare-meshes-data.tar.gz" diff --git a/packages/compress-stringify/package.json b/packages/compress-stringify/package.json index 76af565ea..2ebff15fa 100644 --- a/packages/compress-stringify/package.json +++ b/packages/compress-stringify/package.json @@ -5,8 +5,8 @@ "description": "@itk-wasm/compare-stringify build configuration.", "type": "module", "itk-wasm": { - "emscripten-docker-image": "itkwasm/emscripten:latest", - "wasi-docker-image": "itkwasm/wasi:latest", + "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", + "wasi-docker-image": "localhost/itkwasm/wasi:latest", "test-data-hash": "bafkreiha6oye3fd5cxfadnua5r2jlkaco2xuyeek454d2ihiffsx7rauqe", "test-data-urls": [ "https://placeholder" diff --git a/packages/core/typescript/itk-wasm/package.json b/packages/core/typescript/itk-wasm/package.json index 566225643..0bfabbfa1 100644 --- a/packages/core/typescript/itk-wasm/package.json +++ b/packages/core/typescript/itk-wasm/package.json @@ -38,13 +38,13 @@ "test:node": "ava test/node/**/*.js", "test:browser": "pnpm run test:browser:chrome && pnpm run test:browser:firefox", "test:testPipelines": "pnpm test:buildTestPipelines:emscripten && pnpm test:buildTestPipelines:wasi && pnpm test:runTestPipelines", - "test:buildTestPipelines:emscripten:debug": "node src/itk-wasm-cli.js -i itkwasm/emscripten:latest-debug -b emscripten-build -s ./test/pipelines build -- -DCMAKE_BUILD_TYPE=Debug", - "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 -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:buildTestPipelines:emscripten:debug": "node src/itk-wasm-cli.js -i localhost/itkwasm/emscripten:latest-debug -b emscripten-build -s ./test/pipelines build -- -DCMAKE_BUILD_TYPE=Debug", + "test:buildTestPipelines:emscripten": "node src/itk-wasm-cli.js -i localhost/itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines build", + "test:buildTestPipelines:wasi": "node src/itk-wasm-cli.js -i localhost/itkwasm/wasi:latest -b wasi-build -s ./test/pipelines build", + "test:buildTestPipelines:wasi:debug": "node src/itk-wasm-cli.js -i localhost/itkwasm/wasi:latest-debug -b wasi-build -s ./test/pipelines build -- -DCMAKE_BUILD_TYPE=Debug", + "test:runTestPipelines": "node src/itk-wasm-cli.js -i localhost/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 localhost/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 localhost/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", diff --git a/packages/dicom/package.json b/packages/dicom/package.json index 3ebcb152e..5117d26f1 100644 --- a/packages/dicom/package.json +++ b/packages/dicom/package.json @@ -10,8 +10,8 @@ "https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.119/dicom-test-data.tar.gz", "https://w3s.link/ipfs/bafybeiby67winzvozowf4moqthwunuxxscssitnb6wahxv4ugvfxhu2vki/data.tar.gz" ], - "emscripten-docker-image": "itkwasm/emscripten:latest", - "wasi-docker-image": "itkwasm/wasi:latest", + "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", + "wasi-docker-image": "localhost/itkwasm/wasi:latest", "typescript-package-name": "@itk-wasm/dicom", "python-package-name": "itkwasm-dicom", "package-description": "Read and write files and images related to DICOM file format.", diff --git a/packages/downsample/package.json b/packages/downsample/package.json index ce618acde..e0c28717a 100644 --- a/packages/downsample/package.json +++ b/packages/downsample/package.json @@ -5,8 +5,8 @@ "description": "Pipelines for downsampling images.", "type": "module", "itk-wasm": { - "emscripten-docker-image": "itkwasm/emscripten:latest", - "wasi-docker-image": "itkwasm/wasi:latest", + "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", + "wasi-docker-image": "localhost/itkwasm/wasi:latest", "test-data-hash": "bafkreic7utwwa32sc7ekhouzdlnla4kffytphcwc7qwam5ndhixwjulydq", "test-data-urls": [ "https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.163/itkwasm-downsample-test-data.tar.gz https://w3s.link/ipfs/bafybeifwebok64osjl2i3zc6rkn3izgon333wsjotqzqlxorkkvrbldjcy/data.tar.gz", diff --git a/packages/image-io/package.json b/packages/image-io/package.json index 7ceac5d75..01a938362 100644 --- a/packages/image-io/package.json +++ b/packages/image-io/package.json @@ -5,8 +5,8 @@ "description": "Input and output for scientific and medical image file formats.", "type": "module", "itk-wasm": { - "emscripten-docker-image": "itkwasm/emscripten:latest", - "wasi-docker-image": "itkwasm/wasi:latest", + "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", + "wasi-docker-image": "localhost/itkwasm/wasi:latest", "typescript-package-name": "@itk-wasm/image-io", "python-package-name": "itkwasm-image-io", "package-description": "Input and output for scientific and medical image file formats.", diff --git a/packages/mesh-io/package.json b/packages/mesh-io/package.json index 280bc974c..487fb132a 100644 --- a/packages/mesh-io/package.json +++ b/packages/mesh-io/package.json @@ -9,8 +9,8 @@ "test-data-urls": [ "https://bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq.ipfs.w3s.link/ipfs/bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq/data.tar.gz" ], - "emscripten-docker-image": "itkwasm/emscripten:latest", - "wasi-docker-image": "itkwasm/wasi:latest", + "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", + "wasi-docker-image": "localhost/itkwasm/wasi:latest", "typescript-package-name": "@itk-wasm/mesh-io", "python-package-name": "itkwasm-mesh-io", "package-description": "Input and output for mesh file formats.", diff --git a/packages/transform-io/package.json b/packages/transform-io/package.json index d80c94ca1..eaea5e588 100644 --- a/packages/transform-io/package.json +++ b/packages/transform-io/package.json @@ -9,8 +9,8 @@ "test-data-urls": [ "https://bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq.ipfs.w3s.link/ipfs/bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq/data.tar.gz" ], - "emscripten-docker-image": "itkwasm/emscripten:latest", - "wasi-docker-image": "itkwasm/wasi:latest", + "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", + "wasi-docker-image": "localhost/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.", From 00b24ef07a0914a53d76cf715c1b0f5c2e3dfc33 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 5 Dec 2024 13:13:56 -0500 Subject: [PATCH 03/11] build(pixi): fix transform-io test data reference path --- itk_wasm_env.bash | 4 ++-- packages/transform-io/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/itk_wasm_env.bash b/itk_wasm_env.bash index 8407d427f..58a98b0d8 100755 --- a/itk_wasm_env.bash +++ b/itk_wasm_env.bash @@ -43,5 +43,5 @@ export ITK_WASM_DOWNSAMPLE_TEST_DATA_URLS=${ITK_WASM_DOWNSAMPLE_TEST_DATA_URLS:- 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_TRANSFORM_IO_TEST_DATA_HASH=${ITK_WASM_TRANSFORM_IO_TEST_DATA_HASH:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-hash"')} -export ITK_WASM_TRANSFORM_IO_TEST_DATA_URLS=${ITK_WASM_TRANSFORM_IO_TEST_DATA_URLS:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')} \ No newline at end of file +export ITK_WASM_TRANSFORM_IO_TEST_DATA_HASH=${ITK_WASM_TRANSFORM_IO_TEST_DATA_HASH:-$(cat packages/transform-io/package.json | jq -e -r '."itk-wasm"."test-data-hash"')} +export ITK_WASM_TRANSFORM_IO_TEST_DATA_URLS=${ITK_WASM_TRANSFORM_IO_TEST_DATA_URLS:-$(cat packages/transform-io/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')} \ No newline at end of file diff --git a/packages/transform-io/package.json b/packages/transform-io/package.json index eaea5e588..2f3db83b8 100644 --- a/packages/transform-io/package.json +++ b/packages/transform-io/package.json @@ -5,9 +5,9 @@ "description": "scripts to generate @itk-wasm/transform-io itk-wasm artifacts.", "type": "module", "itk-wasm": { - "test-data-hash": "bafkreiahocrgb3p4xrjozr7cg5wdpdt6wp77kolnqyupae6awkplb5p4he", + "test-data-hash": "bafkreihranpzszz3q5bwgzsw6olqwh2e726wfnh4qblkjbng44yhqbfin4", "test-data-urls": [ - "https://bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq.ipfs.w3s.link/ipfs/bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq/data.tar.gz" + "https://bafybeihn3n52vhja45ds3d4wsch3i77rej2oylorjgevt55w3aqirgxzme.ipfs.w3s.link/ipfs/bafybeihn3n52vhja45ds3d4wsch3i77rej2oylorjgevt55w3aqirgxzme/data.tar.gz" ], "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", "wasi-docker-image": "localhost/itkwasm/wasi:latest", From 4767f6f7d4cd38c152f299d246f0f9ae5456be71 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Fri, 6 Dec 2024 12:59:00 -0500 Subject: [PATCH 04/11] ci(cypress): pull development docker containers --- .github/workflows/cypress.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index ea8f264b1..3b4683fa0 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -32,6 +32,10 @@ jobs: large-packages: false tool-cache: true + - name: Pull latest Docker images + run: | + ./src/docker/pull.sh --no-debug + - uses: actions/setup-node@v4 with: node-version: '20' @@ -111,6 +115,10 @@ jobs: large-packages: false tool-cache: true + - name: Pull latest Docker images + run: | + ./src/docker/pull.sh --no-debug + - uses: actions/setup-node@v4 with: node-version: '20' From a3638d71e19f5c1e23236406b7d18b477656d8fe Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Fri, 6 Dec 2024 13:01:44 -0500 Subject: [PATCH 05/11] ci(cxx-python): fix commit reference To address: Invalid workflow file: .github/workflows/cxx-python.yml#L17 invalid value workflow reference: too many '@' in workflow reference --- .github/workflows/cxx-python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cxx-python.yml b/.github/workflows/cxx-python.yml index 5f5f6b8c4..f72d65911 100644 --- a/.github/workflows/cxx-python.yml +++ b/.github/workflows/cxx-python.yml @@ -14,7 +14,7 @@ env: jobs: cxx-build-workflow: # itk-wasm branch - uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@l@6868c9879405def5d7532e0437b57e78cbe0b6ea + uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@6868c9879405def5d7532e0437b57e78cbe0b6ea with: itk-module-deps: 'MeshToPolyData@v0.11.0' ctest-options: '-E itkPipelineTest' From 53b191eea97ba0d525aefed58e8db57ad6441534 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 9 Dec 2024 17:19:08 -0500 Subject: [PATCH 06/11] feat(pull.sh): tag images as localhost after pulling We want to use these as the development images after pulling. --- src/docker/pull.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/docker/pull.sh b/src/docker/pull.sh index 9406984be..ea141419f 100755 --- a/src/docker/pull.sh +++ b/src/docker/pull.sh @@ -17,11 +17,15 @@ done set -- "${newparams[@]}" # overwrites the original positional params $exe pull quay.io/itkwasm/emscripten:latest +$exe tag quay.io/itkwasm/emscripten:latest localhost/itkwasm/emscripten:latest if $debug; then $exe pull quay.io/itkwasm/emscripten:latest-debug + $exe tag quay.io/itkwasm/emscripten:latest-debug localhost/itkwasm/emscripten:latest-debug fi $exe pull quay.io/itkwasm/wasi:latest +$exe tag quay.io/itkwasm/wasi:latest localhost/itkwasm/wasi:latest if $debug; then $exe pull quay.io/itkwasm/wasi:latest-debug + $exe tag quay.io/itkwasm/wasi:latest-debug localhost/itkwasm/wasi:latest-debug fi From 1d78755e1a23a12d431e41ae25cf238566cb3d3b Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 9 Dec 2024 17:31:29 -0500 Subject: [PATCH 07/11] ci(examples): bump node-version to 22 --- .github/workflows/examples.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 4d8249ac7..e00011630 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20' + node-version: '22' - name: Install uses: pnpm/action-setup@v4 @@ -60,7 +60,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '22' - name: Install run: | @@ -125,7 +125,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '22' - name: Install run: | @@ -160,7 +160,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20' + node-version: '22' - name: Install uses: pnpm/action-setup@v4 @@ -268,7 +268,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20' + node-version: '22' - name: Build dependencies run: | @@ -303,7 +303,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '22' - name: Install run: | @@ -332,7 +332,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20' + node-version: '22' - name: Install uses: pnpm/action-setup@v4 From a5f6e6abe312f21ad16a103f7a6412944da7ebae Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 9 Dec 2024 17:30:40 -0500 Subject: [PATCH 08/11] ci(examples): pull docker images --- .github/workflows/examples.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index e00011630..e81874c0e 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -22,6 +22,10 @@ jobs: large-packages: false tool-cache: true + - name: Pull latest Docker images + run: | + ./src/docker/pull.sh --no-debug + - uses: actions/setup-node@v4 with: node-version: '22' @@ -158,6 +162,10 @@ jobs: large-packages: false tool-cache: true + - name: Pull latest Docker images + run: | + ../../src/docker/pull.sh --no-debug + - uses: actions/setup-node@v4 with: node-version: '22' @@ -261,6 +269,10 @@ jobs: large-packages: false tool-cache: true + - name: Pull latest Docker images + run: | + ../../src/docker/pull.sh --no-debug + - name: Install uses: pnpm/action-setup@v4 with: @@ -301,6 +313,10 @@ jobs: large-packages: false tool-cache: true + - name: Pull latest Docker images + run: | + ../../src/docker/pull.sh --no-debug + - uses: actions/setup-node@v4 with: node-version: '22' @@ -330,6 +346,10 @@ jobs: large-packages: false tool-cache: true + - name: Pull latest Docker images + run: | + ./src/docker/pull.sh --no-debug + - uses: actions/setup-node@v4 with: node-version: '22' From 40d6095abc085ab96d4e7df6b2b0796fa5fa6bd4 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 9 Dec 2024 22:10:13 -0500 Subject: [PATCH 09/11] build(docker): use quay.io as repository name Fully qualify the image name and use a value that both docker and podman will understand. --- packages/compare-images/package.json | 4 +- packages/compare-meshes/package.json | 4 +- packages/compress-stringify/package.json | 4 +- .../core/typescript/itk-wasm/package.json | 14 ++--- packages/dicom/package.json | 4 +- packages/downsample/package.json | 4 +- packages/image-io/package.json | 4 +- packages/mesh-io/package.json | 4 +- packages/transform-io/package.json | 4 +- src/docker/itk-wasm-base/build.sh | 46 +++++++------- src/docker/itk-wasm/Dockerfile | 4 +- src/docker/itk-wasm/build.sh | 60 +++++++++---------- src/docker/push.sh | 8 +-- 13 files changed, 82 insertions(+), 82 deletions(-) diff --git a/packages/compare-images/package.json b/packages/compare-images/package.json index 52bb3dd0e..898b388a4 100644 --- a/packages/compare-images/package.json +++ b/packages/compare-images/package.json @@ -5,8 +5,8 @@ "description": "@itk-wasm/compare-stringify build configuration", "type": "module", "itk-wasm": { - "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", - "wasi-docker-image": "localhost/itkwasm/wasi:latest", + "emscripten-docker-image": "quay.io/itkwasm/emscripten:latest", + "wasi-docker-image": "quay.io/itkwasm/wasi:latest", "test-data-hash": "bafybeiafli6egtmkcgany65po64w67hpqnmgwr5utqo6ycbbz7k5l33llu", "test-data-urls": [ "https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.171/compare-images-test-data.tar.gz" diff --git a/packages/compare-meshes/package.json b/packages/compare-meshes/package.json index 0046b451e..464b57a4f 100644 --- a/packages/compare-meshes/package.json +++ b/packages/compare-meshes/package.json @@ -5,8 +5,8 @@ "description": "@itk-wasm/compare-meshes build configuration.", "type": "module", "itk-wasm": { - "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", - "wasi-docker-image": "localhost/itkwasm/wasi:latest", + "emscripten-docker-image": "quay.io/itkwasm/emscripten:latest", + "wasi-docker-image": "quay.io/itkwasm/wasi:latest", "test-data-hash": "bafkreibsonywg3w3gscmookip3elsyydfsn2cbubk6dukatkmjgeguhiri", "test-data-urls": [ "https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.178/compare-meshes-data.tar.gz" diff --git a/packages/compress-stringify/package.json b/packages/compress-stringify/package.json index 2ebff15fa..e52fe3b71 100644 --- a/packages/compress-stringify/package.json +++ b/packages/compress-stringify/package.json @@ -5,8 +5,8 @@ "description": "@itk-wasm/compare-stringify build configuration.", "type": "module", "itk-wasm": { - "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", - "wasi-docker-image": "localhost/itkwasm/wasi:latest", + "emscripten-docker-image": "quay.io/itkwasm/emscripten:latest", + "wasi-docker-image": "quay.io/itkwasm/wasi:latest", "test-data-hash": "bafkreiha6oye3fd5cxfadnua5r2jlkaco2xuyeek454d2ihiffsx7rauqe", "test-data-urls": [ "https://placeholder" diff --git a/packages/core/typescript/itk-wasm/package.json b/packages/core/typescript/itk-wasm/package.json index c0ab0c936..8f6274997 100644 --- a/packages/core/typescript/itk-wasm/package.json +++ b/packages/core/typescript/itk-wasm/package.json @@ -38,13 +38,13 @@ "test:node": "ava test/node/**/*.js", "test:browser": "pnpm run test:browser:chrome && pnpm run test:browser:firefox", "test:testPipelines": "pnpm test:buildTestPipelines:emscripten && pnpm test:buildTestPipelines:wasi && pnpm test:runTestPipelines", - "test:buildTestPipelines:emscripten:debug": "node src/itk-wasm-cli.js -i localhost/itkwasm/emscripten:latest-debug -b emscripten-build -s ./test/pipelines build -- -DCMAKE_BUILD_TYPE=Debug", - "test:buildTestPipelines:emscripten": "node src/itk-wasm-cli.js -i localhost/itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines build", - "test:buildTestPipelines:wasi": "node src/itk-wasm-cli.js -i localhost/itkwasm/wasi:latest -b wasi-build -s ./test/pipelines build", - "test:buildTestPipelines:wasi:debug": "node src/itk-wasm-cli.js -i localhost/itkwasm/wasi:latest-debug -b wasi-build -s ./test/pipelines build -- -DCMAKE_BUILD_TYPE=Debug", - "test:runTestPipelines": "node src/itk-wasm-cli.js -i localhost/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 localhost/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 localhost/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:buildTestPipelines:emscripten:debug": "node src/itk-wasm-cli.js -i quay.io/itkwasm/emscripten:latest-debug -b emscripten-build -s ./test/pipelines build -- -DCMAKE_BUILD_TYPE=Debug", + "test:buildTestPipelines:emscripten": "node src/itk-wasm-cli.js -i quay.io/itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines build", + "test:buildTestPipelines:wasi": "node src/itk-wasm-cli.js -i quay.io/itkwasm/wasi:latest -b wasi-build -s ./test/pipelines build", + "test:buildTestPipelines:wasi:debug": "node src/itk-wasm-cli.js -i quay.io/itkwasm/wasi:latest-debug -b wasi-build -s ./test/pipelines build -- -DCMAKE_BUILD_TYPE=Debug", + "test:runTestPipelines": "node src/itk-wasm-cli.js -i quay.io/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 quay.io/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 quay.io/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", diff --git a/packages/dicom/package.json b/packages/dicom/package.json index 5117d26f1..b84b5f196 100644 --- a/packages/dicom/package.json +++ b/packages/dicom/package.json @@ -10,8 +10,8 @@ "https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.119/dicom-test-data.tar.gz", "https://w3s.link/ipfs/bafybeiby67winzvozowf4moqthwunuxxscssitnb6wahxv4ugvfxhu2vki/data.tar.gz" ], - "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", - "wasi-docker-image": "localhost/itkwasm/wasi:latest", + "emscripten-docker-image": "quay.io/itkwasm/emscripten:latest", + "wasi-docker-image": "quay.io/itkwasm/wasi:latest", "typescript-package-name": "@itk-wasm/dicom", "python-package-name": "itkwasm-dicom", "package-description": "Read and write files and images related to DICOM file format.", diff --git a/packages/downsample/package.json b/packages/downsample/package.json index e0c28717a..30eec7919 100644 --- a/packages/downsample/package.json +++ b/packages/downsample/package.json @@ -5,8 +5,8 @@ "description": "Pipelines for downsampling images.", "type": "module", "itk-wasm": { - "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", - "wasi-docker-image": "localhost/itkwasm/wasi:latest", + "emscripten-docker-image": "quay.io/itkwasm/emscripten:latest", + "wasi-docker-image": "quay.io/itkwasm/wasi:latest", "test-data-hash": "bafkreic7utwwa32sc7ekhouzdlnla4kffytphcwc7qwam5ndhixwjulydq", "test-data-urls": [ "https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.163/itkwasm-downsample-test-data.tar.gz https://w3s.link/ipfs/bafybeifwebok64osjl2i3zc6rkn3izgon333wsjotqzqlxorkkvrbldjcy/data.tar.gz", diff --git a/packages/image-io/package.json b/packages/image-io/package.json index 01a938362..4dce4e6dc 100644 --- a/packages/image-io/package.json +++ b/packages/image-io/package.json @@ -5,8 +5,8 @@ "description": "Input and output for scientific and medical image file formats.", "type": "module", "itk-wasm": { - "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", - "wasi-docker-image": "localhost/itkwasm/wasi:latest", + "emscripten-docker-image": "quay.io/itkwasm/emscripten:latest", + "wasi-docker-image": "quay.io/itkwasm/wasi:latest", "typescript-package-name": "@itk-wasm/image-io", "python-package-name": "itkwasm-image-io", "package-description": "Input and output for scientific and medical image file formats.", diff --git a/packages/mesh-io/package.json b/packages/mesh-io/package.json index 487fb132a..2ca5c5a95 100644 --- a/packages/mesh-io/package.json +++ b/packages/mesh-io/package.json @@ -9,8 +9,8 @@ "test-data-urls": [ "https://bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq.ipfs.w3s.link/ipfs/bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq/data.tar.gz" ], - "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", - "wasi-docker-image": "localhost/itkwasm/wasi:latest", + "emscripten-docker-image": "quay.io/itkwasm/emscripten:latest", + "wasi-docker-image": "quay.io/itkwasm/wasi:latest", "typescript-package-name": "@itk-wasm/mesh-io", "python-package-name": "itkwasm-mesh-io", "package-description": "Input and output for mesh file formats.", diff --git a/packages/transform-io/package.json b/packages/transform-io/package.json index 2f3db83b8..eb52fe589 100644 --- a/packages/transform-io/package.json +++ b/packages/transform-io/package.json @@ -9,8 +9,8 @@ "test-data-urls": [ "https://bafybeihn3n52vhja45ds3d4wsch3i77rej2oylorjgevt55w3aqirgxzme.ipfs.w3s.link/ipfs/bafybeihn3n52vhja45ds3d4wsch3i77rej2oylorjgevt55w3aqirgxzme/data.tar.gz" ], - "emscripten-docker-image": "localhost/itkwasm/emscripten:latest", - "wasi-docker-image": "localhost/itkwasm/wasi:latest", + "emscripten-docker-image": "quay.io/itkwasm/emscripten:latest", + "wasi-docker-image": "quay.io/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.", diff --git a/src/docker/itk-wasm-base/build.sh b/src/docker/itk-wasm-base/build.sh index e9b2829c7..39a6dd639 100755 --- a/src/docker/itk-wasm-base/build.sh +++ b/src/docker/itk-wasm-base/build.sh @@ -46,14 +46,14 @@ wasi_debug_ld_flags="-fno-lto -lwasi-emulated-process-clocks -lwasi-emulated-sig wasi_debug_c_flags="-fno-lto -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_SIGNAL" if $create_manifest; then - for list in itkwasm/emscripten-base:latest \ - itkwasm/emscripten-base:${TAG} \ - itkwasm/emscripten-base:latest-debug \ - itkwasm/emscripten-base:${TAG}-debug \ - itkwasm/wasi-base:latest \ - itkwasm/wasi-base:${TAG} \ - itkwasm/wasi-base:latest-debug \ - itkwasm/wasi-base:${TAG}-debug; do + for list in quay.io/itkwasm/emscripten-base:latest \ + quay.io/itkwasm/emscripten-base:${TAG} \ + quay.io/itkwasm/emscripten-base:latest-debug \ + quay.io/itkwasm/emscripten-base:${TAG}-debug \ + quay.io/itkwasm/wasi-base:latest \ + quay.io/itkwasm/wasi-base:${TAG} \ + quay.io/itkwasm/wasi-base:latest-debug \ + quay.io/itkwasm/wasi-base:${TAG}-debug; do if $(buildah manifest exists $list); then buildah manifest rm $list fi @@ -61,16 +61,16 @@ if $create_manifest; then done fi -$exe $build_cmd $tag_flag itkwasm/emscripten-base:latest \ - --build-arg IMAGE=itkwasm/emscripten-base \ +$exe $build_cmd $tag_flag quay.io/itkwasm/emscripten-base:latest \ + --build-arg IMAGE=quay.io/itkwasm/emscripten-base \ --build-arg CMAKE_BUILD_TYPE=Release \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ $script_dir $@ if $version_tag; then - $exe $build_cmd $tag_flag itkwasm/emscripten-base:${TAG} \ - --build-arg IMAGE=itkwasm/emscripten-base \ + $exe $build_cmd $tag_flag quay.io/itkwasm/emscripten-base:${TAG} \ + --build-arg IMAGE=quay.io/itkwasm/emscripten-base \ --build-arg CMAKE_BUILD_TYPE=Release \ --build-arg VERSION=${TAG} \ --build-arg VCS_REF=${VCS_REF} \ @@ -80,8 +80,8 @@ if $version_tag; then fi if $wasi; then - $exe $build_cmd $tag_flag itkwasm/wasi-base:latest \ - --build-arg IMAGE=itkwasm/wasi-base \ + $exe $build_cmd $tag_flag quay.io/itkwasm/wasi-base:latest \ + --build-arg IMAGE=quay.io/itkwasm/wasi-base \ --build-arg CMAKE_BUILD_TYPE=Release \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ @@ -91,7 +91,7 @@ if $wasi; then --build-arg CFLAGS="${wasi_c_flags}" \ $script_dir $@ if $version_tag; then - $exe $build_cmd $tag_flag itkwasm/wasi-base:${TAG} \ + $exe $build_cmd $tag_flag quay.io/itkwasm/wasi-base:${TAG} \ --build-arg IMAGE=itkwasm/wasi-base \ --build-arg CMAKE_BUILD_TYPE=Release \ --build-arg VERSION=${TAG} \ @@ -107,8 +107,8 @@ fi if $debug; then - $exe $build_cmd $tag_flag itkwasm/emscripten-base:latest-debug \ - --build-arg IMAGE=itkwasm/emscripten-base \ + $exe $build_cmd $tag_flag quay.io/itkwasm/emscripten-base:latest-debug \ + --build-arg IMAGE=quay.io/itkwasm/emscripten-base \ --build-arg CMAKE_BUILD_TYPE=Debug \ --build-arg USE_DCMTK=OFF \ --build-arg VCS_REF=${VCS_REF} \ @@ -118,8 +118,8 @@ if $debug; then --build-arg CFLAGS="${emscripten_debug_c_flags}" \ $script_dir $@ if $version_tag; then - $exe $build_cmd $tag_flag itkwasm/emscripten-base:${TAG}-debug \ - --build-arg IMAGE=itkwasm/emscripten-base \ + $exe $build_cmd $tag_flag quay.io/itkwasm/emscripten-base:${TAG}-debug \ + --build-arg IMAGE=quay.io/itkwasm/emscripten-base \ --build-arg CMAKE_BUILD_TYPE=Debug \ --build-arg USE_DCMTK=OFF \ --build-arg VERSION=${TAG}-debug \ @@ -131,8 +131,8 @@ if $debug; then $script_dir $@ fi if $wasi; then - $exe $build_cmd $tag_flag itkwasm/wasi-base:latest-debug \ - --build-arg IMAGE=itkwasm/wasi-base \ + $exe $build_cmd $tag_flag quay.io/itkwasm/wasi-base:latest-debug \ + --build-arg IMAGE=quay.io/itkwasm/wasi-base \ --build-arg CMAKE_BUILD_TYPE=Debug \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ @@ -142,8 +142,8 @@ if $debug; then --build-arg CFLAGS="${wasi_debug_c_flags}" \ $script_dir $@ if $version_tag; then - $exe $build_cmd $tag_flag itkwasm/wasi-base:${TAG}-debug \ - --build-arg IMAGE=itkwasm/wasi-base \ + $exe $build_cmd $tag_flag quay.io/itkwasm/wasi-base:${TAG}-debug \ + --build-arg IMAGE=quay.io/itkwasm/wasi-base \ --build-arg CMAKE_BUILD_TYPE=Debug \ --build-arg VERSION=${TAG} \ --build-arg VCS_REF=${VCS_REF} \ diff --git a/src/docker/itk-wasm/Dockerfile b/src/docker/itk-wasm/Dockerfile index 308d84cb7..538e832ae 100644 --- a/src/docker/itk-wasm/Dockerfile +++ b/src/docker/itk-wasm/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=itkwasm/emscripten-base +ARG BASE_IMAGE=quay.io/itkwasm/emscripten-base ARG BASE_TAG=latest FROM $BASE_IMAGE:$BASE_TAG @@ -44,7 +44,7 @@ RUN if [ $BASE_IMAGE = "itkwasm/emscripten-base" ]; then cd /median-filter-pipel # Build-time metadata as defined at http://label-schema.org ARG BUILD_DATE -ARG IMAGE=itkwasm/emscripten +ARG IMAGE=quay.io/itkwasm/emscripten ARG VERSION=latest ARG VCS_REF ARG VCS_URL diff --git a/src/docker/itk-wasm/build.sh b/src/docker/itk-wasm/build.sh index a1d31d3ee..61fd8eb8d 100755 --- a/src/docker/itk-wasm/build.sh +++ b/src/docker/itk-wasm/build.sh @@ -47,14 +47,14 @@ done set -- "${newparams[@]}" # overwrites the original positional params if $create_manifest; then - for list in itk-wasm/emscripten:latest \ - itk-wasm/emscripten:${TAG} \ - itk-wasm/emscripten:latest-debug \ - itk-wasm/emscripten:${TAG}-debug \ - itk-wasm/wasi:latest \ - itk-wasm/wasi:${TAG} \ - itk-wasm/wasi:latest-debug \ - itk-wasm/wasi:${TAG}-debug; do + for list in quay.io/itk-wasm/emscripten:latest \ + quay.io/itk-wasm/emscripten:${TAG} \ + quay.io/itk-wasm/emscripten:latest-debug \ + quay.io/itk-wasm/emscripten:${TAG}-debug \ + quay.io/itk-wasm/wasi:latest \ + quay.io/itk-wasm/wasi:${TAG} \ + quay.io/itk-wasm/wasi:latest-debug \ + quay.io/itk-wasm/wasi:${TAG}-debug; do if $(buildah manifest exists $list); then buildah manifest rm $list fi @@ -62,19 +62,19 @@ if $create_manifest; then done fi -$exe $build_cmd --pull=false $tag_flag itkwasm/emscripten:latest \ - --build-arg IMAGE=itkwasm/emscripten \ +$exe $build_cmd --pull=false $tag_flag quay.io/itkwasm/emscripten:latest \ + --build-arg IMAGE=quay.io/itkwasm/emscripten \ --build-arg CMAKE_BUILD_TYPE=Release \ - --build-arg BASE_IMAGE=itkwasm/emscripten-base \ + --build-arg BASE_IMAGE=quay.io/itkwasm/emscripten-base \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ $script_dir $@ if $version_tag; then - $exe $build_cmd --pull=false $tag_flag itkwasm/emscripten:${TAG} \ - --build-arg IMAGE=itkwasm/emscripten \ + $exe $build_cmd --pull=false $tag_flag quay.io/itkwasm/emscripten:${TAG} \ + --build-arg IMAGE=quay.io/itkwasm/emscripten \ --build-arg CMAKE_BUILD_TYPE=Release \ - --build-arg BASE_IMAGE=itkwasm/emscripten-base \ + --build-arg BASE_IMAGE=quay.io/itkwasm/emscripten-base \ --build-arg BASE_TAG=${TAG} \ --build-arg VERSION=${TAG} \ --build-arg VCS_REF=${VCS_REF} \ @@ -84,21 +84,21 @@ if $version_tag; then fi if $wasi; then - $exe $build_cmd --pull=false $tag_flag itkwasm/wasi:latest \ - --build-arg IMAGE=itkwasm/wasi \ + $exe $build_cmd --pull=false $tag_flag quay.io/itkwasm/wasi:latest \ + --build-arg IMAGE=quay.io/itkwasm/wasi \ --build-arg CMAKE_BUILD_TYPE=Release \ - --build-arg BASE_IMAGE=itkwasm/wasi-base \ + --build-arg BASE_IMAGE=quay.io/itkwasm/wasi-base \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ $script_dir $@ if $version_tag; then - $exe $build_cmd --pull=false $tag_flag itkwasm/wasi:${TAG} \ - --build-arg IMAGE=itkwasm/wasi \ + $exe $build_cmd --pull=false $tag_flag quay.io/itkwasm/wasi:${TAG} \ + --build-arg IMAGE=quay.io/itkwasm/wasi \ --build-arg CMAKE_BUILD_TYPE=Release \ --build-arg VERSION=${TAG} \ --build-arg BASE_TAG=${TAG} \ - --build-arg BASE_IMAGE=itkwasm/wasi-base \ + --build-arg BASE_IMAGE=quay.io/itkwasm/wasi-base \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ @@ -107,16 +107,16 @@ if $wasi; then fi if $debug; then - $exe $build_cmd --pull=false $tag_flag itkwasm/emscripten:latest-debug \ - --build-arg IMAGE=itkwasm/emscripten \ + $exe $build_cmd --pull=false $tag_flag quay.io/itkwasm/emscripten:latest-debug \ + --build-arg IMAGE=quay.io/itkwasm/emscripten \ --build-arg CMAKE_BUILD_TYPE=Debug \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ $script_dir $@ if $version_tag; then - $exe $build_cmd --pull=false $tag_flag itkwasm/emscripten:${TAG}-debug \ - --build-arg IMAGE=itkwasm/emscripten \ + $exe $build_cmd --pull=false $tag_flag quay.io/itkwasm/emscripten:${TAG}-debug \ + --build-arg IMAGE=quay.io/itkwasm/emscripten \ --build-arg CMAKE_BUILD_TYPE=Debug \ --build-arg VERSION=${TAG}-debug \ --build-arg BASE_TAG=${TAG}-debug \ @@ -126,21 +126,21 @@ if $debug; then $script_dir $@ fi if $wasi; then - $exe $build_cmd --pull=false $tag_flag itkwasm/wasi:latest-debug \ - --build-arg IMAGE=itkwasm/wasi \ + $exe $build_cmd --pull=false $tag_flag quay.io/itkwasm/wasi:latest-debug \ + --build-arg IMAGE=quay.io/itkwasm/wasi \ --build-arg CMAKE_BUILD_TYPE=Debug \ - --build-arg BASE_IMAGE=itkwasm/wasi-base \ + --build-arg BASE_IMAGE=quay.io/itkwasm/wasi-base \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ $script_dir $@ if $version_tag; then - $exe $build_cmd --pull=false $tag_flag itkwasm/wasi:${TAG}-debug \ - --build-arg IMAGE=itkwasm/wasi \ + $exe $build_cmd --pull=false $tag_flag quay.io/itkwasm/wasi:${TAG}-debug \ + --build-arg IMAGE=quay.io/itkwasm/wasi \ --build-arg CMAKE_BUILD_TYPE=Debug \ --build-arg VERSION=${TAG} \ --build-arg BASE_TAG=${TAG}-debug \ - --build-arg BASE_IMAGE=itkwasm/wasi-base \ + --build-arg BASE_IMAGE=quay.io/itkwasm/wasi-base \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ diff --git a/src/docker/push.sh b/src/docker/push.sh index dc8283eaf..67e94a2fd 100755 --- a/src/docker/push.sh +++ b/src/docker/push.sh @@ -25,11 +25,11 @@ function push_image() { local image=$1 local tag=$2 local debug=$3 - $exe push localhost/${image}:${tag} docker://docker.io/${image}:${tag} - $exe push localhost/${image}:${tag} docker://quay.io/${image}:${tag} + $exe push quay.io/${image}:${tag} docker://docker.io/${image}:${tag} + $exe push quay.io/${image}:${tag} docker://quay.io/${image}:${tag} if $debug; then - $exe push localhost/${image}:${tag}-debug docker://docker.io/${image}:${tag}-debug - $exe push localhost/${image}:${tag}-debug docker://quay.io/${image}:${tag}-debug + $exe push quay.io/${image}:${tag}-debug docker://docker.io/${image}:${tag}-debug + $exe push quay.io/${image}:${tag}-debug docker://quay.io/${image}:${tag}-debug fi } From edf1efd0f09396135cd72d9464a16de5fdbb48fb Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Tue, 10 Dec 2024 07:26:31 -0500 Subject: [PATCH 10/11] ci(python-wasm): bump pyodide-version to 0.26.3 --- .github/workflows/python-wasm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-wasm.yml b/.github/workflows/python-wasm.yml index f1bea7929..c4a9e29ea 100644 --- a/.github/workflows/python-wasm.yml +++ b/.github/workflows/python-wasm.yml @@ -9,7 +9,7 @@ on: - main env: - pyodide-version: 0.24.1 + pyodide-version: 0.26.3 defaults: run: From a85fd77205bad074f352ec1cee91bdb30d12cd6b Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Tue, 10 Dec 2024 07:27:20 -0500 Subject: [PATCH 11/11] ci(python-wasm): bump node-version to 22 --- .github/workflows/python-wasm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-wasm.yml b/.github/workflows/python-wasm.yml index c4a9e29ea..d84adb864 100644 --- a/.github/workflows/python-wasm.yml +++ b/.github/workflows/python-wasm.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: '20' + node-version: '22' - name: Install uses: pnpm/action-setup@v4