Skip to content

Commit 70b6604

Browse files
thewtexthewtex
committed
build(docker): use quay.io as repository name
Fully qualify the image name and use a value that both docker and podman will understand.
1 parent 938db9a commit 70b6604

File tree

13 files changed

+82
-82
lines changed

13 files changed

+82
-82
lines changed

‎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": "localhost/itkwasm/emscripten:latest",
9-
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
8+
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
9+
"wasi-docker-image": "quay.io/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": "localhost/itkwasm/emscripten:latest",
9-
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
8+
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
9+
"wasi-docker-image": "quay.io/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": "localhost/itkwasm/emscripten:latest",
9-
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
8+
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
9+
"wasi-docker-image": "quay.io/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 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\"",
41+
"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",
42+
"test:buildTestPipelines:emscripten": "node src/itk-wasm-cli.js -i quay.io/itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines build",
43+
"test:buildTestPipelines:wasi": "node src/itk-wasm-cli.js -i quay.io/itkwasm/wasi:latest -b wasi-build -s ./test/pipelines build",
44+
"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",
45+
"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",
46+
"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\"",
47+
"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\"",
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": "localhost/itkwasm/emscripten:latest",
14-
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
13+
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
14+
"wasi-docker-image": "quay.io/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": "localhost/itkwasm/emscripten:latest",
9-
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
8+
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
9+
"wasi-docker-image": "quay.io/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": "localhost/itkwasm/emscripten:latest",
9-
"wasi-docker-image": "localhost/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/image-io",
1111
"python-package-name": "itkwasm-image-io",
1212
"package-description": "Input and output for scientific and medical image file formats.",

‎packages/mesh-io/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test-data-urls": [
1010
"https://bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq.ipfs.w3s.link/ipfs/bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq/data.tar.gz"
1111
],
12-
"emscripten-docker-image": "localhost/itkwasm/emscripten:latest",
13-
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
12+
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
13+
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
1414
"typescript-package-name": "@itk-wasm/mesh-io",
1515
"python-package-name": "itkwasm-mesh-io",
1616
"package-description": "Input and output for mesh file formats.",

‎packages/transform-io/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test-data-urls": [
1010
"https://bafybeihn3n52vhja45ds3d4wsch3i77rej2oylorjgevt55w3aqirgxzme.ipfs.w3s.link/ipfs/bafybeihn3n52vhja45ds3d4wsch3i77rej2oylorjgevt55w3aqirgxzme/data.tar.gz"
1111
],
12-
"emscripten-docker-image": "localhost/itkwasm/emscripten:latest",
13-
"wasi-docker-image": "localhost/itkwasm/wasi:latest",
12+
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
13+
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
1414
"typescript-package-name": "@itk-wasm/transform-io",
1515
"python-package-name": "itkwasm-transform-io",
1616
"package-description": "Input and output for scientific and medical coordinate transform file formats.",

‎src/docker/itk-wasm-base/build.sh‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,31 @@ wasi_debug_ld_flags="-fno-lto -lwasi-emulated-process-clocks -lwasi-emulated-sig
4646
wasi_debug_c_flags="-fno-lto -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_SIGNAL"
4747

4848
if $create_manifest; then
49-
for list in itkwasm/emscripten-base:latest \
50-
itkwasm/emscripten-base:${TAG} \
51-
itkwasm/emscripten-base:latest-debug \
52-
itkwasm/emscripten-base:${TAG}-debug \
53-
itkwasm/wasi-base:latest \
54-
itkwasm/wasi-base:${TAG} \
55-
itkwasm/wasi-base:latest-debug \
56-
itkwasm/wasi-base:${TAG}-debug; do
49+
for list in quay.io/itkwasm/emscripten-base:latest \
50+
quay.io/itkwasm/emscripten-base:${TAG} \
51+
quay.io/itkwasm/emscripten-base:latest-debug \
52+
quay.io/itkwasm/emscripten-base:${TAG}-debug \
53+
quay.io/itkwasm/wasi-base:latest \
54+
quay.io/itkwasm/wasi-base:${TAG} \
55+
quay.io/itkwasm/wasi-base:latest-debug \
56+
quay.io/itkwasm/wasi-base:${TAG}-debug; do
5757
if $(buildah manifest exists $list); then
5858
buildah manifest rm $list
5959
fi
6060
buildah manifest create $list
6161
done
6262
fi
6363

64-
$exe $build_cmd $tag_flag itkwasm/emscripten-base:latest \
65-
--build-arg IMAGE=itkwasm/emscripten-base \
64+
$exe $build_cmd $tag_flag quay.io/itkwasm/emscripten-base:latest \
65+
--build-arg IMAGE=quay.io/itkwasm/emscripten-base \
6666
--build-arg CMAKE_BUILD_TYPE=Release \
6767
--build-arg VCS_REF=${VCS_REF} \
6868
--build-arg VCS_URL=${VCS_URL} \
6969
--build-arg BUILD_DATE=${BUILD_DATE} \
7070
$script_dir $@
7171
if $version_tag; then
72-
$exe $build_cmd $tag_flag itkwasm/emscripten-base:${TAG} \
73-
--build-arg IMAGE=itkwasm/emscripten-base \
72+
$exe $build_cmd $tag_flag quay.io/itkwasm/emscripten-base:${TAG} \
73+
--build-arg IMAGE=quay.io/itkwasm/emscripten-base \
7474
--build-arg CMAKE_BUILD_TYPE=Release \
7575
--build-arg VERSION=${TAG} \
7676
--build-arg VCS_REF=${VCS_REF} \
@@ -80,8 +80,8 @@ if $version_tag; then
8080
fi
8181

8282
if $wasi; then
83-
$exe $build_cmd $tag_flag itkwasm/wasi-base:latest \
84-
--build-arg IMAGE=itkwasm/wasi-base \
83+
$exe $build_cmd $tag_flag quay.io/itkwasm/wasi-base:latest \
84+
--build-arg IMAGE=quay.io/itkwasm/wasi-base \
8585
--build-arg CMAKE_BUILD_TYPE=Release \
8686
--build-arg VCS_REF=${VCS_REF} \
8787
--build-arg VCS_URL=${VCS_URL} \
@@ -91,7 +91,7 @@ if $wasi; then
9191
--build-arg CFLAGS="${wasi_c_flags}" \
9292
$script_dir $@
9393
if $version_tag; then
94-
$exe $build_cmd $tag_flag itkwasm/wasi-base:${TAG} \
94+
$exe $build_cmd $tag_flag quay.io/itkwasm/wasi-base:${TAG} \
9595
--build-arg IMAGE=itkwasm/wasi-base \
9696
--build-arg CMAKE_BUILD_TYPE=Release \
9797
--build-arg VERSION=${TAG} \
@@ -107,8 +107,8 @@ fi
107107

108108

109109
if $debug; then
110-
$exe $build_cmd $tag_flag itkwasm/emscripten-base:latest-debug \
111-
--build-arg IMAGE=itkwasm/emscripten-base \
110+
$exe $build_cmd $tag_flag quay.io/itkwasm/emscripten-base:latest-debug \
111+
--build-arg IMAGE=quay.io/itkwasm/emscripten-base \
112112
--build-arg CMAKE_BUILD_TYPE=Debug \
113113
--build-arg USE_DCMTK=OFF \
114114
--build-arg VCS_REF=${VCS_REF} \
@@ -118,8 +118,8 @@ if $debug; then
118118
--build-arg CFLAGS="${emscripten_debug_c_flags}" \
119119
$script_dir $@
120120
if $version_tag; then
121-
$exe $build_cmd $tag_flag itkwasm/emscripten-base:${TAG}-debug \
122-
--build-arg IMAGE=itkwasm/emscripten-base \
121+
$exe $build_cmd $tag_flag quay.io/itkwasm/emscripten-base:${TAG}-debug \
122+
--build-arg IMAGE=quay.io/itkwasm/emscripten-base \
123123
--build-arg CMAKE_BUILD_TYPE=Debug \
124124
--build-arg USE_DCMTK=OFF \
125125
--build-arg VERSION=${TAG}-debug \
@@ -131,8 +131,8 @@ if $debug; then
131131
$script_dir $@
132132
fi
133133
if $wasi; then
134-
$exe $build_cmd $tag_flag itkwasm/wasi-base:latest-debug \
135-
--build-arg IMAGE=itkwasm/wasi-base \
134+
$exe $build_cmd $tag_flag quay.io/itkwasm/wasi-base:latest-debug \
135+
--build-arg IMAGE=quay.io/itkwasm/wasi-base \
136136
--build-arg CMAKE_BUILD_TYPE=Debug \
137137
--build-arg VCS_REF=${VCS_REF} \
138138
--build-arg VCS_URL=${VCS_URL} \
@@ -142,8 +142,8 @@ if $debug; then
142142
--build-arg CFLAGS="${wasi_debug_c_flags}" \
143143
$script_dir $@
144144
if $version_tag; then
145-
$exe $build_cmd $tag_flag itkwasm/wasi-base:${TAG}-debug \
146-
--build-arg IMAGE=itkwasm/wasi-base \
145+
$exe $build_cmd $tag_flag quay.io/itkwasm/wasi-base:${TAG}-debug \
146+
--build-arg IMAGE=quay.io/itkwasm/wasi-base \
147147
--build-arg CMAKE_BUILD_TYPE=Debug \
148148
--build-arg VERSION=${TAG} \
149149
--build-arg VCS_REF=${VCS_REF} \

0 commit comments

Comments
 (0)