From 564826383fd9df0290f3cd282ebe9483d093388a Mon Sep 17 00:00:00 2001 From: jsotobroad Date: Thu, 7 Mar 2019 10:48:22 -0500 Subject: [PATCH] Update haplochecker version in dockerfile and task to match (#5760) * update haplochecker dockerfile and corresponding task, get rid of mitochondria dependencies zip, and update tests to match --- scripts/m2_cromwell_tests/run_m2_wdl.sh | 5 ++++- scripts/mitochondria_m2_wdl/AlignAndCall.wdl | 6 +++--- .../mitochondria_m2_wdl/Haplochecker/Dockerfile | 3 ++- .../MitochondriaPipelineDependencies.zip | Bin 6986 -> 0 bytes 4 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 scripts/mitochondria_m2_wdl/MitochondriaPipelineDependencies.zip diff --git a/scripts/m2_cromwell_tests/run_m2_wdl.sh b/scripts/m2_cromwell_tests/run_m2_wdl.sh index 2c5a343cd3c..f6756842028 100644 --- a/scripts/m2_cromwell_tests/run_m2_wdl.sh +++ b/scripts/m2_cromwell_tests/run_m2_wdl.sh @@ -50,4 +50,7 @@ echo "Running M2 WDL through cromwell (Tumor-only)" sudo java -jar $CROMWELL_JAR run $WORKING_DIR/gatk/scripts/mutect2_wdl/mutect2_multi_sample.wdl -i $WORKING_DIR/test_m2_wdl_multi_mod_to.json -m $WORKING_DIR/test_m2_wdl_to.metadata echo "Running Mitochondria M2 WDL through cromwell" -sudo java -jar $CROMWELL_JAR run $WORKING_DIR/gatk/scripts/mitochondria_m2_wdl/MitochondriaPipeline.wdl -i $WORKING_DIR/gatk/scripts/m2_cromwell_tests/test_mitochondria_m2_wdl.json --imports $WORKING_DIR/gatk/scripts/mitochondria_m2_wdl/MitochondriaPipelineDependencies.zip -m $WORKING_DIR/test_mitochondria_m2_wdl.metadata +ln -fs $WORKING_DIR/gatk/scripts/mitochondria_m2_wdl/AlignAndCall.wdl +ln -fs $WORKING_DIR/gatk/scripts/mitochondria_m2_wdl/AlignmentPipeline.wdl +ln -fs $WORKING_DIR/gatk/scripts/mitochondria_m2_wdl/MitochondriaCalling.wdl +sudo java -jar $CROMWELL_JAR run $WORKING_DIR/gatk/scripts/mitochondria_m2_wdl/MitochondriaPipeline.wdl -i $WORKING_DIR/gatk/scripts/m2_cromwell_tests/test_mitochondria_m2_wdl.json -m $WORKING_DIR/test_mitochondria_m2_wdl.metadata diff --git a/scripts/mitochondria_m2_wdl/AlignAndCall.wdl b/scripts/mitochondria_m2_wdl/AlignAndCall.wdl index f6e0fce9928..58d7990b0ec 100644 --- a/scripts/mitochondria_m2_wdl/AlignAndCall.wdl +++ b/scripts/mitochondria_m2_wdl/AlignAndCall.wdl @@ -176,7 +176,7 @@ task GetContamination { Int map_qual = 30 Float vaf = 0.01 - String basename = basename(input_bam) + String basename = basename(input_bam, ".bam") # runtime Int? preemptible_tries @@ -193,7 +193,7 @@ task GetContamination { command { set -e - java -jar /usr/mtdnaserver/mitolib-0.1.0.jar haplochecker \ + java -jar /usr/mtdnaserver/mitolib.jar haplochecker \ --in ${input_bam} \ --ref ${ref_fasta} \ --out haplochecker_out \ @@ -218,7 +218,7 @@ CODE preemptible: select_first([preemptible_tries, 5]) memory: "3 GB" disks: "local-disk " + disk_size + " HDD" - docker: "gatkworkflows/mtdnaserver:1.0" + docker: "gatkworkflows/mtdnaserver:1.2" } output { File contamination_file = "haplochecker_out/${basename}.contamination.txt" diff --git a/scripts/mitochondria_m2_wdl/Haplochecker/Dockerfile b/scripts/mitochondria_m2_wdl/Haplochecker/Dockerfile index d3e6e38aea2..b2e265409e3 100644 --- a/scripts/mitochondria_m2_wdl/Haplochecker/Dockerfile +++ b/scripts/mitochondria_m2_wdl/Haplochecker/Dockerfile @@ -9,4 +9,5 @@ RUN apt-get update && \ WORKDIR /usr/mtdnaserver # Download mitolib jar -RUN wget https://github.com/haansi/mitolib/releases/download/v0.1.0/mitolib-0.1.0.jar +RUN wget https://github.com/haansi/mitolib/releases/download/0.1.2/mitolib-0.1.2.jar && \ + mv mitolib-0.1.2.jar mitolib.jar diff --git a/scripts/mitochondria_m2_wdl/MitochondriaPipelineDependencies.zip b/scripts/mitochondria_m2_wdl/MitochondriaPipelineDependencies.zip deleted file mode 100644 index 97f5c9e4e2d3fea3de91dac8eb61d0bc8aaeed91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6986 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