Skip to content

Commit 2bf0769

Browse files
committed
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.
1 parent 23b0c54 commit 2bf0769

File tree

12 files changed

+31
-31
lines changed

12 files changed

+31
-31
lines changed

examples/debugging/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"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",
77
"native-build": "cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Debug && cmake --build build/ --config Debug",
88
"native-debug-linux": "gdb --args ./build/DebugMe",
9-
"emscripten-build-release": "itk-wasm -i itkwasm/emscripten:latest --build-dir emscripten-build-release build",
9+
"emscripten-build-release": "itk-wasm -i quay.io/itkwasm/emscripten:latest --build-dir emscripten-build-release build",
1010
"run-node-release": "node ./runEmscriptenNode.js ./emscripten-build-release/DebugMe",
11-
"emscripten-build-debug": "itk-wasm -i itkwasm/emscripten:latest-debug --build-dir emscripten-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
11+
"emscripten-build-debug": "itk-wasm -i quay.io/itkwasm/emscripten:latest-debug --build-dir emscripten-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
1212
"run-node-debug": "node ./runEmscriptenNode.js ./emscripten-build-debug/DebugMe",
13-
"wasi-build-release": "itk-wasm -i itkwasm/wasi:latest --build-dir wasi-build-release build",
13+
"wasi-build-release": "itk-wasm -i quay.io/itkwasm/wasi:latest --build-dir wasi-build-release build",
1414
"node-inspect": "node --inspect-brk ./runEmscriptenNode.js ./emscripten-build-debug/DebugMe",
15-
"wasi-build-debug": "itk-wasm -i itkwasm/wasi:latest-debug --build-dir wasi-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
15+
"wasi-build-debug": "itk-wasm -i quay.io/itkwasm/wasi:latest-debug --build-dir wasi-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
1616
"run-wasi-debug": "itk-wasm --build-dir wasi-build-debug run DebugMe.wasi.wasm",
1717
"start": "http-server -o"
1818
},

examples/inputs-outputs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"description": "An itk-wasm pipeline example for inputs/outputs",
66
"type": "module",
77
"itk-wasm": {
8-
"emscripten-docker-image": "itkwasm/emscripten:latest",
9-
"wasi-docker-image": "itkwasm/wasi:latest",
8+
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
9+
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
1010
"typescript-package-name": "@itk-wasm/inputs-outputs-example",
1111
"python-package-name": "itkwasm-inputs-outputs-example",
1212
"package-description": "An example that has non-trivial inputs and outputs.",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"description": "Illustrate the use of the VersorRigid3DTransform for 3D image registration.",
66
"type": "module",
77
"itk-wasm": {
8-
"emscripten-docker-image": "itkwasm/emscripten:latest",
9-
"wasi-docker-image": "itkwasm/wasi:latest",
8+
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
9+
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
1010
"typescript-package-name": "@itk-wasm/mean-squares-versor-registration-example",
1111
"python-package-name": "itkwasm-mean-squares-versor-registration-example",
1212
"package-description": "Example 3D versor transform registration with a mean-squares similarity metric",

packages/compare-images/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"description": "@itk-wasm/compare-stringify build configuration",
66
"type": "module",
77
"itk-wasm": {
8-
"emscripten-docker-image": "itkwasm/emscripten:latest",
9-
"wasi-docker-image": "itkwasm/wasi:latest",
8+
"emscripten-docker-image": "localhost/itkwasm/emscripten:latest",
9+
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
1010
"test-data-hash": "bafybeiafli6egtmkcgany65po64w67hpqnmgwr5utqo6ycbbz7k5l33llu",
1111
"test-data-urls": [
1212
"https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.171/compare-images-test-data.tar.gz"

packages/compare-meshes/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"description": "@itk-wasm/compare-meshes build configuration.",
66
"type": "module",
77
"itk-wasm": {
8-
"emscripten-docker-image": "itkwasm/emscripten:latest",
9-
"wasi-docker-image": "itkwasm/wasi:latest",
8+
"emscripten-docker-image": "localhost/itkwasm/emscripten:latest",
9+
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
1010
"test-data-hash": "bafkreibsonywg3w3gscmookip3elsyydfsn2cbubk6dukatkmjgeguhiri",
1111
"test-data-urls": [
1212
"https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.178/compare-meshes-data.tar.gz"

packages/compress-stringify/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"description": "@itk-wasm/compare-stringify build configuration.",
66
"type": "module",
77
"itk-wasm": {
8-
"emscripten-docker-image": "itkwasm/emscripten:latest",
9-
"wasi-docker-image": "itkwasm/wasi:latest",
8+
"emscripten-docker-image": "localhost/itkwasm/emscripten:latest",
9+
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
1010
"test-data-hash": "bafkreiha6oye3fd5cxfadnua5r2jlkaco2xuyeek454d2ihiffsx7rauqe",
1111
"test-data-urls": [
1212
"https://placeholder"

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
"test:node": "ava test/node/**/*.js",
3939
"test:browser": "pnpm run test:browser:chrome && pnpm run test:browser:firefox",
4040
"test:testPipelines": "pnpm test:buildTestPipelines:emscripten && pnpm test:buildTestPipelines:wasi && pnpm test:runTestPipelines",
41-
"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",
42-
"test:buildTestPipelines:emscripten": "node src/itk-wasm-cli.js -i itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines build",
43-
"test:buildTestPipelines:wasi": "node src/itk-wasm-cli.js -i itkwasm/wasi:latest -b wasi-build -s ./test/pipelines build",
44-
"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",
45-
"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",
46-
"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\"",
47-
"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\"",
41+
"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",
42+
"test:buildTestPipelines:emscripten": "node src/itk-wasm-cli.js -i localhost/itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines build",
43+
"test:buildTestPipelines:wasi": "node src/itk-wasm-cli.js -i localhost/itkwasm/wasi:latest -b wasi-build -s ./test/pipelines build",
44+
"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",
45+
"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",
46+
"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\"",
47+
"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\"",
4848
"test:browser:debug": "start-server-and-test start http-get://localhost:5180 cypress:open",
4949
"test:cypress": "start-server-and-test start http-get://localhost:5180 cypress:run",
5050
"test:browser:chrome": "start-server-and-test start http-get://localhost:5180 cypress:runChrome",

packages/dicom/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.119/dicom-test-data.tar.gz",
1111
"https://w3s.link/ipfs/bafybeiby67winzvozowf4moqthwunuxxscssitnb6wahxv4ugvfxhu2vki/data.tar.gz"
1212
],
13-
"emscripten-docker-image": "itkwasm/emscripten:latest",
14-
"wasi-docker-image": "itkwasm/wasi:latest",
13+
"emscripten-docker-image": "localhost/itkwasm/emscripten:latest",
14+
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
1515
"typescript-package-name": "@itk-wasm/dicom",
1616
"python-package-name": "itkwasm-dicom",
1717
"package-description": "Read and write files and images related to DICOM file format.",

packages/downsample/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"description": "Pipelines for downsampling images.",
66
"type": "module",
77
"itk-wasm": {
8-
"emscripten-docker-image": "itkwasm/emscripten:latest",
9-
"wasi-docker-image": "itkwasm/wasi:latest",
8+
"emscripten-docker-image": "localhost/itkwasm/emscripten:latest",
9+
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
1010
"test-data-hash": "bafkreic7utwwa32sc7ekhouzdlnla4kffytphcwc7qwam5ndhixwjulydq",
1111
"test-data-urls": [
1212
"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",

packages/image-io/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"description": "Input and output for scientific and medical image file formats.",
66
"type": "module",
77
"itk-wasm": {
8-
"emscripten-docker-image": "itkwasm/emscripten:latest",
9-
"wasi-docker-image": "itkwasm/wasi:latest",
8+
"emscripten-docker-image": "localhost/itkwasm/emscripten:latest",
9+
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
1010
"typescript-package-name": "@itk-wasm/image-io",
1111
"python-package-name": "itkwasm-image-io",
1212
"package-description": "Input and output for scientific and medical image file formats.",

0 commit comments

Comments
 (0)