From 76748372b3d9a1891c87292dfd45fb3e34139e17 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Tue, 31 Dec 2024 22:59:02 -0500 Subject: [PATCH 1/3] build(docker): remove images of the same name before creating manifests --- src/docker/itk-wasm/build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/docker/itk-wasm/build.sh b/src/docker/itk-wasm/build.sh index f435ba4a8..7c05859de 100755 --- a/src/docker/itk-wasm/build.sh +++ b/src/docker/itk-wasm/build.sh @@ -150,6 +150,11 @@ if $create_manifest; then quay.io/itkwasm/wasi:${TAG} \ quay.io/itkwasm/wasi:latest-debug \ quay.io/itkwasm/wasi:${TAG}-debug; do + if [ "$(buildah images -q $list 2>/dev/null)" != "" ]; then + if ! $(buildah manifest exists $list); then + buildah rmi $list + fi + fi if $(buildah manifest exists $list); then buildah manifest rm $list fi From 640fe3be9cd764826e24c9babae5fd783af436ce Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 2 Jan 2025 01:04:27 -0500 Subject: [PATCH 2/3] feat(itk-wasm-cli): Update default Docker image for 20250102-76748372 --- packages/core/typescript/itk-wasm/src/cli/default-image-tag.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 17e2b681b..549ad65a1 100644 --- 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 = '20241230-6a87601b' +const defaultImageTag = '20241231-76748372' export default defaultImageTag From 64aed84fba8353dffeb2a66d266433b26ca52cb5 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 2 Jan 2025 01:04:30 -0500 Subject: [PATCH 3/3] build(docker): fix manifest generation --- src/docker/itk-wasm/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docker/itk-wasm/build.sh b/src/docker/itk-wasm/build.sh index 7c05859de..0ee02078d 100755 --- a/src/docker/itk-wasm/build.sh +++ b/src/docker/itk-wasm/build.sh @@ -161,6 +161,6 @@ if $create_manifest; then buildah manifest create $list buildah manifest add ${list} ${list}-amd64 buildah pull $list-arm64 - buildah manifest add ${list} docker://${list}-arm64 + buildah manifest add ${list} ${list}-arm64 done fi