From 836e67a6ab8de66d8908c75856774318729544f4 Mon Sep 17 00:00:00 2001 From: Alireza Date: Wed, 8 Jan 2025 09:00:22 -0500 Subject: [PATCH] fix(docker): publish manifest for multiarch and update cs3d (#4650) --- .circleci/config.yml | 134 +++++++++++++++--- bun.lockb | Bin 1341970 -> 1342602 bytes .../cornerstone-dicom-pmap/package.json | 4 +- extensions/cornerstone-dicom-seg/package.json | 4 +- extensions/cornerstone-dicom-sr/package.json | 6 +- .../cornerstone-dynamic-volume/package.json | 4 +- extensions/cornerstone/package.json | 8 +- extensions/measurement-tracking/package.json | 4 +- platform/app/package.json | 2 +- platform/core/package.json | 2 +- yarn.lock | 32 ++--- 11 files changed, 145 insertions(+), 55 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f8fced437..ef8cf92ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -208,7 +208,7 @@ jobs: - setup_remote_docker: docker_layer_caching: false - run: - name: Build and push Docker image from the release branch + name: Build Docker image for amd64 command: | # This file will exist if a new version was published by # our command in the previous job. @@ -222,12 +222,16 @@ jobs: export IMAGE_VERSION_FULL=v$IMAGE_VERSION echo $IMAGE_VERSION echo $IMAGE_VERSION_FULL - # Build our image, auth, and push - docker build --tag ohif/app:$IMAGE_VERSION_FULL --tag ohif/app:latest . + # Build our amd64 image, auth, and push + docker build --platform linux/amd64 --tag ohif/app:$IMAGE_VERSION_FULL-amd64 --tag ohif/app:latest-amd64 . echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin - docker push ohif/app:$IMAGE_VERSION_FULL - docker push ohif/app:latest + docker push ohif/app:$IMAGE_VERSION_FULL-amd64 + docker push ohif/app:latest-amd64 fi + - persist_to_workspace: + root: ~/repo + paths: + - . DOCKER_RELEASE_PUBLISH_ARM: <<: *defaults @@ -238,7 +242,7 @@ jobs: - setup_remote_docker: docker_layer_caching: false - run: - name: Build and push ARM64 Docker image from the release branch + name: Build Docker image for arm64 command: | # This file will exist if a new version was published by # our command in the previous job. @@ -252,12 +256,16 @@ jobs: export IMAGE_VERSION_FULL=v$IMAGE_VERSION echo $IMAGE_VERSION echo $IMAGE_VERSION_FULL - # Build our ARM64 image, auth, and push - docker build --tag ohif/app:$IMAGE_VERSION_FULL-arm64 --tag ohif/app:latest-arm64 . + # Build our arm64 image, auth, and push + docker build --platform linux/arm64 --tag ohif/app:$IMAGE_VERSION_FULL-arm64 --tag ohif/app:latest-arm64 . echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin docker push ohif/app:$IMAGE_VERSION_FULL-arm64 docker push ohif/app:latest-arm64 fi + - persist_to_workspace: + root: ~/repo + paths: + - . DOCKER_BETA_PUBLISH: <<: *defaults @@ -268,7 +276,7 @@ jobs: - setup_remote_docker: docker_layer_caching: false - run: - name: Build and push Docker image from the master branch (beta releases) + name: Build Docker image for amd64 (Beta) command: | echo $(ls -l) @@ -280,19 +288,17 @@ jobs: else echo "Building and pushing Docker image from the master branch (beta releases)" rm -f ./.npmrc + # Set our version number using vars export IMAGE_VERSION=$(cat version.txt) export IMAGE_VERSION_FULL=v$IMAGE_VERSION echo $IMAGE_VERSION echo $IMAGE_VERSION_FULL - # Build our image, auth, and push - - echo "starting docker build" - docker build --tag ohif/app:$IMAGE_VERSION_FULL . + # Build our amd64 image, auth, and push + docker build --platform linux/amd64 --tag ohif/app:$IMAGE_VERSION_FULL-amd64 --tag ohif/app:latest-beta-amd64 . echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin - - echo "starting docker push" - docker push ohif/app:$IMAGE_VERSION_FULL + docker push ohif/app:$IMAGE_VERSION_FULL-amd64 + docker push ohif/app:latest-beta-amd64 fi DOCKER_BETA_PUBLISH_ARM: @@ -304,7 +310,7 @@ jobs: - setup_remote_docker: docker_layer_caching: false - run: - name: Build and push ARM64 Docker image from the master branch (beta releases) + name: Build Docker image for arm64 (Beta) command: | echo $(ls -l) @@ -321,13 +327,11 @@ jobs: export IMAGE_VERSION_FULL=v$IMAGE_VERSION echo $IMAGE_VERSION echo $IMAGE_VERSION_FULL - # Build our ARM64 image, auth, and push - echo "starting docker build" - docker build --tag ohif/app:$IMAGE_VERSION_FULL-arm64 . + # Build our arm64 image, auth, and push + docker build --platform linux/arm64 --tag ohif/app:$IMAGE_VERSION_FULL-arm64 --tag ohif/app:latest-beta-arm64 . echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin - - echo "starting docker push" docker push ohif/app:$IMAGE_VERSION_FULL-arm64 + docker push ohif/app:latest-beta-arm64 fi CYPRESS: @@ -356,6 +360,84 @@ jobs: --browser chrome --parallel start-command: bun run test:data && bun run test:e2e:serve + DOCKER_MULTIARCH_MANIFEST: + <<: *defaults + resource_class: large + steps: + - attach_workspace: + at: ~/repo + - setup_remote_docker: + docker_layer_caching: false + - run: + name: Create and push multi-architecture manifest + command: | + # This file will exist if a new version was published by + # our command in the previous job. + if [[ ! -e version.txt ]]; then + exit 0 + else + echo "Building and pushing multi-architecture manifest from the master branch (release releases)" + rm -f ./.npmrc + # Set our version number using vars + export IMAGE_VERSION=$(cat version.txt) + export IMAGE_VERSION_FULL=v$IMAGE_VERSION + echo $IMAGE_VERSION + echo $IMAGE_VERSION_FULL + echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin + + # Create and push manifest for specific version + docker manifest create ohif/app:$IMAGE_VERSION_FULL \ + --amend ohif/app:$IMAGE_VERSION_FULL-amd64 \ + --amend ohif/app:$IMAGE_VERSION_FULL-arm64 + docker manifest push ohif/app:$IMAGE_VERSION_FULL + + # Create and push manifest for "latest" tag + docker manifest create ohif/app:latest \ + --amend ohif/app:latest-amd64 \ + --amend ohif/app:latest-arm64 + docker manifest push ohif/app:latest + fi + + DOCKER_BETA_MULTIARCH_MANIFEST: + <<: *defaults + resource_class: large + steps: + - attach_workspace: + at: ~/repo + - setup_remote_docker: + docker_layer_caching: false + - run: + name: Create and push multi-architecture manifest (Beta) + command: | + echo $(ls -l) + + # This file will exist if a new version was published by + # our command in the previous job. + if [[ ! -e version.txt ]]; then + exit 0 + else + echo "Building and pushing multi-architecture manifest from the master branch (beta releases)" + rm -f ./.npmrc + # Set our version number using vars + export IMAGE_VERSION=$(cat version.txt) + export IMAGE_VERSION_FULL=v$IMAGE_VERSION + echo $IMAGE_VERSION + echo $IMAGE_VERSION_FULL + echo $DOCKER_PWD | docker login -u $DOCKER_LOGIN --password-stdin + + # Create and push manifest for specific beta version + docker manifest create ohif/app:$IMAGE_VERSION_FULL \ + --amend ohif/app:$IMAGE_VERSION_FULL-amd64 \ + --amend ohif/app:$IMAGE_VERSION_FULL-arm64 + docker manifest push ohif/app:$IMAGE_VERSION_FULL + + # Create and push manifest for "latest-beta" tag + docker manifest create ohif/app:latest-beta \ + --amend ohif/app:latest-beta-amd64 \ + --amend ohif/app:latest-beta-arm64 + docker manifest push ohif/app:latest-beta + fi + workflows: PR_CHECKS: jobs: @@ -384,6 +466,10 @@ workflows: - DOCKER_BETA_PUBLISH_ARM: requires: - NPM_PUBLISH + - DOCKER_BETA_MULTIARCH_MANIFEST: + requires: + - DOCKER_BETA_PUBLISH + - DOCKER_BETA_PUBLISH_ARM # viewer.ohif.org DEPLOY_RELEASE: @@ -405,3 +491,7 @@ workflows: - DOCKER_RELEASE_PUBLISH_ARM: requires: - NPM_PUBLISH + - DOCKER_MULTIARCH_MANIFEST: + requires: + - DOCKER_RELEASE_PUBLISH + - DOCKER_RELEASE_PUBLISH_ARM diff --git a/bun.lockb b/bun.lockb index 609e29776a62fefea7587dec72c54c1c774d1950..5d927c60ccbc5d517a0908d39d28c3cd39ccdcca 100755 GIT binary patch delta 36382 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 delta 35757 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 diff --git a/extensions/cornerstone-dicom-pmap/package.json b/extensions/cornerstone-dicom-pmap/package.json index ac6acba83..ad6913bc9 100644 --- a/extensions/cornerstone-dicom-pmap/package.json +++ b/extensions/cornerstone-dicom-pmap/package.json @@ -46,8 +46,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.14.2", - "@cornerstonejs/core": "^2.14.2", + "@cornerstonejs/adapters": "^2.14.7", + "@cornerstonejs/core": "^2.14.7", "@kitware/vtk.js": "32.1.1", "react-color": "^2.19.3" } diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json index 2b8148872..2b85b5c47 100644 --- a/extensions/cornerstone-dicom-seg/package.json +++ b/extensions/cornerstone-dicom-seg/package.json @@ -46,8 +46,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.14.2", - "@cornerstonejs/core": "^2.14.2", + "@cornerstonejs/adapters": "^2.14.7", + "@cornerstonejs/core": "^2.14.7", "@kitware/vtk.js": "32.1.1", "react-color": "^2.19.3" } diff --git a/extensions/cornerstone-dicom-sr/package.json b/extensions/cornerstone-dicom-sr/package.json index f2b022e7f..fe445ffa9 100644 --- a/extensions/cornerstone-dicom-sr/package.json +++ b/extensions/cornerstone-dicom-sr/package.json @@ -46,9 +46,9 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.14.2", - "@cornerstonejs/core": "^2.14.2", - "@cornerstonejs/tools": "^2.14.2", + "@cornerstonejs/adapters": "^2.14.7", + "@cornerstonejs/core": "^2.14.7", + "@cornerstonejs/tools": "^2.14.7", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone-dynamic-volume/package.json b/extensions/cornerstone-dynamic-volume/package.json index 574af3288..0017a8cfc 100644 --- a/extensions/cornerstone-dynamic-volume/package.json +++ b/extensions/cornerstone-dynamic-volume/package.json @@ -42,8 +42,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/core": "^2.14.2", - "@cornerstonejs/tools": "^2.14.2", + "@cornerstonejs/core": "^2.14.7", + "@cornerstonejs/tools": "^2.14.7", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index 5b159731b..5d612c9b2 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -38,7 +38,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^2.14.2", + "@cornerstonejs/dicom-image-loader": "^2.14.7", "@icr/polyseg-wasm": "^0.4.0", "@ohif/core": "3.10.0-beta.38", "@ohif/ui": "3.10.0-beta.38", @@ -55,9 +55,9 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.14.2", - "@cornerstonejs/core": "^2.14.2", - "@cornerstonejs/tools": "^2.14.2", + "@cornerstonejs/adapters": "^2.14.7", + "@cornerstonejs/core": "^2.14.7", + "@cornerstonejs/tools": "^2.14.7", "@icr/polyseg-wasm": "^0.4.0", "@kitware/vtk.js": "32.1.1", "html2canvas": "^1.4.1", diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json index 8ccbed4aa..0accbb614 100644 --- a/extensions/measurement-tracking/package.json +++ b/extensions/measurement-tracking/package.json @@ -32,8 +32,8 @@ "start": "yarn run dev" }, "peerDependencies": { - "@cornerstonejs/core": "^2.14.2", - "@cornerstonejs/tools": "^2.14.2", + "@cornerstonejs/core": "^2.14.7", + "@cornerstonejs/tools": "^2.14.7", "@ohif/core": "3.10.0-beta.38", "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.38", "@ohif/extension-default": "3.10.0-beta.38", diff --git a/platform/app/package.json b/platform/app/package.json index b955ea5e9..5b43d54d4 100644 --- a/platform/app/package.json +++ b/platform/app/package.json @@ -53,7 +53,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^2.14.2", + "@cornerstonejs/dicom-image-loader": "^2.14.7", "@emotion/serialize": "^1.1.3", "@ohif/core": "3.10.0-beta.38", "@ohif/extension-cornerstone": "3.10.0-beta.38", diff --git a/platform/core/package.json b/platform/core/package.json index 4a4b31bbf..4af4ceaa1 100644 --- a/platform/core/package.json +++ b/platform/core/package.json @@ -37,7 +37,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^2.14.2", + "@cornerstonejs/dicom-image-loader": "^2.14.7", "@ohif/ui": "3.10.0-beta.38", "cornerstone-math": "0.1.9", "dicom-parser": "^1.8.21" diff --git a/yarn.lock b/yarn.lock index 5aae85974..5070887cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2580,10 +2580,10 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@cornerstonejs/adapters@^2.14.2": - version "2.14.2" - resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-2.14.2.tgz#cd1f750c34a7b723e09092ba3b2486d287a9ccb2" - integrity sha512-/zKVRwyHa0qjYWYKLQXx5776MJGcyEKYt7sXmtsKDj6AJlfx0W8UMP2/DFDlaadfX5jKckHCSDrPOtzzjYbIbQ== +"@cornerstonejs/adapters@^2.14.7": + version "2.14.7" + resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-2.14.7.tgz#ecdcbc9701b26ce5c0336a6252ed44b876b51d87" + integrity sha512-3vbWSfo6k68UzwLQ9ZVgL8DmTJA4mOEXBkETAk2M3+5Jky1EBT5X84UFKVIRzByk/76pG08D/NmPk2/QaO+FUA== dependencies: "@babel/runtime-corejs2" "^7.17.8" buffer "^6.0.3" @@ -2616,19 +2616,19 @@ resolved "https://registry.yarnpkg.com/@cornerstonejs/codec-openjph/-/codec-openjph-2.4.5.tgz#8690b61a86fa53ef38a70eee9d665a79229517c0" integrity sha512-MZCUy8VG0VG5Nl1l58+g+kH3LujAzLYTfJqkwpWI2gjSrGXnP6lgwyy4GmPRZWVoS40/B1LDNALK905cNWm+sg== -"@cornerstonejs/core@^2.14.2": - version "2.14.2" - resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-2.14.2.tgz#35817e0c5cc9e3641df757e43e071ee3c91fde54" - integrity sha512-1a8+b4RtnyPRI6bevfEu4KXhVNiEd1CNeaByKegWbd+FyE5yek6DIwW0fJPIxdhA+z6nacFVdKtgbdAwuTDqoA== +"@cornerstonejs/core@^2.14.7": + version "2.14.7" + resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-2.14.7.tgz#7092f5038ecd2b88ce1417a86885cd5711d04709" + integrity sha512-92gTKuY+Ea0xsEJB1niC7FiNsaWDK7R274ZEEcu+4vb0u6P3eIQOKCut8aKVV5JpVk3C7kJ5QjCMWdG/RNp/eg== dependencies: "@kitware/vtk.js" "32.1.1" comlink "^4.4.1" gl-matrix "^3.4.3" -"@cornerstonejs/dicom-image-loader@^2.14.2": - version "2.14.2" - resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-2.14.2.tgz#643c3d7d1f8ba6632665bce94e9a54c52dedc2b7" - integrity sha512-qNKN+7FoiT6flhhWrNoBYs/v6meiuWtiteo08IKIf+uVpjABnk7lEHXozsQ4GQIieCJ7jhqHHXPMbSHQh6Jktw== +"@cornerstonejs/dicom-image-loader@^2.14.7": + version "2.14.7" + resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-2.14.7.tgz#9de7a5b6fd7dee030f7da5d705de4341af318bb5" + integrity sha512-l/Vbz+5Vd076N+3xFr55aqkHxItqWe4HXjuvLBqm4orb3jWULIoM/34RJg0vGqgXj/UrB4OXxZfwDcuYBDAgEg== dependencies: "@cornerstonejs/codec-charls" "^1.2.3" "@cornerstonejs/codec-libjpeg-turbo-8bit" "^1.2.2" @@ -2639,10 +2639,10 @@ pako "^2.0.4" uuid "^9.0.0" -"@cornerstonejs/tools@^2.14.2": - version "2.14.2" - resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-2.14.2.tgz#2647a564bfda88fa11c7edb6ad691fb4b1ec080c" - integrity sha512-kiWD/hmXxX7N60KLghuN7aItJ2z1jaO3TnCR2gkQ865Rl/aV5yGZEonUqlH4iHrCDS2d7f0NcXQX0sKAc7PJXw== +"@cornerstonejs/tools@^2.14.7": + version "2.14.7" + resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-2.14.7.tgz#da0b4485aff8aa72cd88a74ad30d0a12d762f107" + integrity sha512-8IorarVROvevrWfkKRFGjfDONa14i9V3auWsZTAyi8J0YQ2PKrLx2MLoXWsFYQS4AHhaWRAuVl3GsKR+V/QbzQ== dependencies: "@types/offscreencanvas" "2019.7.3" comlink "^4.4.1"