From 8bcdb155f339bc1662644082c3c3f6be61e94b74 Mon Sep 17 00:00:00 2001 From: Vahid Date: Mon, 16 Oct 2023 10:56:13 -0400 Subject: [PATCH] Add Scramble docker to the build script & update docs (#608) * Add scramble to build_docker.py. * Update docs to include the Scramble docker image. * Manta docker image is now based on the ubuntu 22.04 image. --- scripts/docker/build_docker.py | 3 +++ website/docs/advanced/docker/images.md | 6 ++++-- website/package.json | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/docker/build_docker.py b/scripts/docker/build_docker.py index 242907126..16983362c 100755 --- a/scripts/docker/build_docker.py +++ b/scripts/docker/build_docker.py @@ -176,6 +176,9 @@ class to track dependencies, control build and push of entire job docker_dependencies={ "sv-base": "SVBASE_IMAGE"} ), + "scramble": ImageDependencies( + git_dependencies=("dockerfiles/scramble/*") + ), "wham": ImageDependencies( git_dependencies="dockerfiles/wham/*", docker_dependencies={ diff --git a/website/docs/advanced/docker/images.md b/website/docs/advanced/docker/images.md index 1cda3bbef..8a8f084f7 100644 --- a/website/docs/advanced/docker/images.md +++ b/website/docs/advanced/docker/images.md @@ -29,7 +29,7 @@ The figure below illustrates the relationships between the GATK-SV Docker images ```mermaid flowchart TD - ubuntu22[Ubuntu 22.04] --> svbasemini[sv-base-mini] & samtoolsenv[samtools-cloud-virtual-env] & svbaseenv[sv-base-virtual-env] + ubuntu2204[Ubuntu 22.04] --> svbasemini[sv-base-mini] & samtoolsenv[samtools-cloud-virtual-env] & svbaseenv[sv-base-virtual-env] svbasemini & samtoolsenv & svbaseenv --> svpipelineenv[sv-pipeline-virtual-env] samtoolsenv --> samtoolscloud[samtools-cloud] & svutilsenv[sv-utils-env] svbasemini --> samtoolscloud @@ -39,9 +39,10 @@ flowchart TD svbaseenv --> cnmopsenv[cnmpos-virtual-env] svbase & cnmopsenv --> cnmpos[cnmops] - ubuntu18[Ubuntu 18.04] --> manta[Manta] & melt[MELT] & wham[Wham] + ubuntu1804[Ubuntu 18.04] --> melt[MELT] & wham[Wham] samtoolscloud --> wham ubuntu2210[Ubuntu 22.10] --> str[STR] + ubuntu2204 --> scramble[Scramble] & manta[Manta] ``` The image depicts the hierarchical relationship among GATK-SV @@ -66,6 +67,7 @@ The table below lists the GATK-SV Docker images and their dependencies. |------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------| | `manta` | | | | `melt` | | | +| `scramble` | | | | `wham` | | | | `str` | | | | `sv-base-mini` | | | diff --git a/website/package.json b/website/package.json index 0e74541bf..6fa5dee4c 100644 --- a/website/package.json +++ b/website/package.json @@ -14,9 +14,9 @@ "write-heading-ids": "docusaurus write-heading-ids" }, "dependencies": { - "@docusaurus/core": "2.4.1", - "@docusaurus/preset-classic": "2.4.1", - "@docusaurus/theme-mermaid": "^2.4.1", + "@docusaurus/core": "2.4.3", + "@docusaurus/preset-classic": "2.4.3", + "@docusaurus/theme-mermaid": "^2.4.3", "@mdx-js/react": "^1.6.22", "clsx": "^1.2.1", "prism-react-renderer": "^1.3.5",