Skip to content

Commit 1bba462

Browse files
authored
Merge pull request #639 from broadinstitute/bump-viral-ngs
viral-ngs 3.0.5 to 3.0.6
2 parents a87ce58 + bd262af commit 1bba462

14 files changed

+85
-85
lines changed

pipes/WDL/tasks/tasks_assembly.wdl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ task assemble {
1616

1717
Int? machine_mem_gb
1818
Int? cpu
19-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-assemble"
19+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-assemble"
2020
}
2121
parameter_meta{
2222
reads_unmapped_bam: {
@@ -125,7 +125,7 @@ task select_references {
125125
Int? skani_c
126126
Int? skani_n
127127

128-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-assemble"
128+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-assemble"
129129
Int machine_mem_gb = 4
130130
Int cpu = 2
131131
Int disk_size = 100
@@ -225,7 +225,7 @@ task scaffold {
225225
Float? scaffold_min_pct_contig_aligned
226226

227227
Int? machine_mem_gb
228-
String docker="ghcr.io/broadinstitute/viral-ngs:3.0.5-assemble"
228+
String docker="ghcr.io/broadinstitute/viral-ngs:3.0.6-assemble"
229229

230230
# do this in multiple steps in case the input doesn't actually have "assembly1-x" in the name
231231
String sample_name = basename(basename(contigs_fasta, ".fasta"), ".assembly1-spades")
@@ -478,7 +478,7 @@ task skani_triangle {
478478
Int compression_factor = 10
479479
Int min_aligned_frac = 15
480480

481-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-assemble"
481+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-assemble"
482482
Int machine_mem_gb = 8
483483
Int cpu = 4
484484
Int disk_size = 100
@@ -721,7 +721,7 @@ task align_reads {
721721
722722
Int? cpu
723723
Int? machine_mem_gb
724-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
724+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
725725

726726
String sample_name = basename(basename(basename(reads_unmapped_bam, ".bam"), ".taxfilt"), ".clean")
727727
}
@@ -890,7 +890,7 @@ task refine_assembly_with_aligned_reads {
890890
Int min_coverage = 3
891891

892892
Int machine_mem_gb = 8
893-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-assemble"
893+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-assemble"
894894
}
895895

896896
Int disk_size = 375
@@ -1027,7 +1027,7 @@ task run_discordance {
10271027
String out_basename = "run"
10281028
Int min_coverage = 4
10291029

1030-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
1030+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
10311031
}
10321032
parameter_meta {
10331033
reads_aligned_bam: {
@@ -1276,7 +1276,7 @@ task wgsim {
12761276
Int? random_seed
12771277

12781278
Int machine_mem_gb = 7
1279-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-assemble"
1279+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-assemble"
12801280
}
12811281

12821282
parameter_meta {

pipes/WDL/tasks/tasks_demux.wdl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ task merge_tarballs {
66
String out_filename
77

88
Int? machine_mem_gb
9-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
9+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
1010
}
1111

1212
Int disk_size = 2625
@@ -182,7 +182,7 @@ task illumina_demux {
182182
Int? machine_mem_gb
183183
# Note: GCP local SSDs must be allocated in pairs (2, 4, 8, 16, 24 × 375GB), so use 3000 (8 SSDs) instead of 2625 (7 SSDs)
184184
Int disk_size = 3000
185-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
185+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
186186
}
187187

188188
parameter_meta {
@@ -824,7 +824,7 @@ task get_illumina_run_metadata {
824824
String? sequencing_center
825825

826826
Int? machine_mem_gb
827-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
827+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
828828
}
829829

830830
parameter_meta {
@@ -928,7 +928,7 @@ task demux_fastqs {
928928
Int? machine_mem_gb
929929
Int max_cpu = 32 # Maximum CPU cap for autoscaling (use 16 for 2-barcode, 64 for 3-barcode)
930930
Int disk_size = 750
931-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
931+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
932932
}
933933

934934
# Calculate total input size for autoscaling
@@ -1057,7 +1057,7 @@ task merge_demux_metrics {
10571057
input {
10581058
Array[File]+ metrics_files
10591059
String output_filename = "merged_demux_metrics.txt"
1060-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
1060+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
10611061
}
10621062

10631063
parameter_meta {

pipes/WDL/tasks/tasks_interhost.wdl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ task multi_align_mafft_ref {
160160
Float? mafft_gapOpeningPenalty
161161

162162
Int? machine_mem_gb
163-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo"
163+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo"
164164
}
165165

166166
String fasta_basename = basename(reference_fasta, '.fasta')
@@ -207,7 +207,7 @@ task multi_align_mafft {
207207
Float? mafft_gapOpeningPenalty
208208

209209
Int? machine_mem_gb
210-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo"
210+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo"
211211
}
212212

213213
Int disk_size = 200
@@ -351,7 +351,7 @@ task index_ref {
351351
File? novocraft_license
352352

353353
Int? machine_mem_gb
354-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
354+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
355355
}
356356

357357
Int disk_size = 100
@@ -476,7 +476,7 @@ task merge_vcfs_gatk {
476476
File ref_fasta
477477

478478
Int? machine_mem_gb
479-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo"
479+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo"
480480

481481
String output_prefix = "merged"
482482
}

pipes/WDL/tasks/tasks_intrahost.wdl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ task lofreq {
136136
File reference_fasta
137137

138138
String out_basename = basename(aligned_bam, '.bam')
139-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo"
139+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo"
140140
}
141141
Int disk_size = 200
142142
command <<<
@@ -196,7 +196,7 @@ task isnvs_per_sample {
196196
Boolean removeDoublyMappedReads = true
197197

198198
Int? machine_mem_gb
199-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo"
199+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo"
200200

201201
String sample_name = basename(basename(basename(mapped_bam, ".bam"), ".all"), ".mapped")
202202
}
@@ -239,7 +239,7 @@ task isnvs_vcf {
239239
Boolean naiveFilter = false
240240

241241
Int? machine_mem_gb
242-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo"
242+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo"
243243
}
244244

245245
parameter_meta {
@@ -313,7 +313,7 @@ task annotate_vcf_snpeff {
313313
String? emailAddress
314314

315315
Int? machine_mem_gb
316-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo"
316+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo"
317317

318318
String output_basename = basename(basename(in_vcf, ".gz"), ".vcf")
319319
}

pipes/WDL/tasks/tasks_megablast.wdl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ task trim_rmdup_subsamp {
1515
Int cpu = 16
1616
Int disk_size_gb = 100
1717

18-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
18+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
1919
}
2020

2121
parameter_meta {
@@ -75,7 +75,7 @@ task lca_megablast {
7575
Int cpu = 16
7676
Int disk_size_gb = 300
7777

78-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-classify"
78+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-classify"
7979
}
8080
parameter_meta {
8181
trimmed_fasta: {

pipes/WDL/tasks/tasks_metagenomics.wdl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ task kraken2 {
218218
Int? min_base_qual
219219

220220
Int machine_mem_gb = 90
221-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-classify"
221+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-classify"
222222
}
223223

224224
parameter_meta {
@@ -351,7 +351,7 @@ task report_primary_kraken_taxa {
351351
File kraken_summary_report
352352
String focal_taxon = "Viruses"
353353

354-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-classify"
354+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-classify"
355355
}
356356
String out_basename = basename(kraken_summary_report, '.txt')
357357
Int disk_size = 50
@@ -402,7 +402,7 @@ task filter_refs_to_found_taxa {
402402
File taxdump_tgz
403403
Int min_read_count = 100
404404

405-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-classify"
405+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-classify"
406406
}
407407
String ref_basename = basename(taxid_to_ref_accessions_tsv, '.tsv')
408408
String hits_basename = basename(focal_report_tsv, '.tsv')
@@ -453,7 +453,7 @@ task build_kraken2_db {
453453
Int? zstd_compression_level
454454

455455
Int machine_mem_gb = 100
456-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-classify"
456+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-classify"
457457
}
458458

459459
Int disk_size = 750
@@ -595,7 +595,7 @@ task blastx {
595595
File krona_taxonomy_db_tgz
596596

597597
Int machine_mem_gb = 8
598-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-classify"
598+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-classify"
599599
}
600600

601601
parameter_meta {
@@ -685,7 +685,7 @@ task krona {
685685
Int? magnitude_column
686686

687687
Int machine_mem_gb = 3
688-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-classify"
688+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-classify"
689689
}
690690

691691
Int disk_size = 50
@@ -792,7 +792,7 @@ task filter_bam_to_taxa {
792792
String out_filename_suffix = "filtered"
793793

794794
Int machine_mem_gb = 8
795-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-classify"
795+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-classify"
796796
}
797797

798798
String out_basename = basename(classified_bam, ".bam") + "." + out_filename_suffix
@@ -885,7 +885,7 @@ task kaiju {
885885
File krona_taxonomy_db_tgz # taxonomy/taxonomy.tab
886886
887887
Int machine_mem_gb = 100
888-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-classify"
888+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-classify"
889889
}
890890

891891
String input_basename = basename(reads_unmapped_bam, ".bam")

pipes/WDL/tasks/tasks_ncbi.wdl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ task download_fasta {
66
Array[String]+ accessions
77
String emailAddress
88

9-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo"
9+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo"
1010
}
1111

1212
command <<<
@@ -42,7 +42,7 @@ task download_fasta_from_accession_string {
4242
String out_prefix
4343
String emailAddress
4444

45-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo"
45+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo"
4646
}
4747

4848
command <<<
@@ -94,7 +94,7 @@ task download_annotations {
9494
String emailAddress
9595
String combined_out_prefix
9696

97-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo"
97+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo"
9898
}
9999

100100
command <<<
@@ -136,7 +136,7 @@ task download_ref_genomes_from_tsv {
136136
File ref_genomes_tsv # [tax_id, isolate_prefix, taxname, colon_delim_accession_list]
137137
String emailAddress
138138

139-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo"
139+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo"
140140
}
141141

142142
command <<<
@@ -183,7 +183,7 @@ task sequencing_platform_from_bam {
183183
input {
184184
File bam
185185

186-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
186+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
187187
}
188188

189189
command <<<
@@ -238,7 +238,7 @@ task align_and_annot_transfer_single {
238238

239239
String out_basename = basename(genome_fasta, '.fasta')
240240
Int machine_mem_gb = 30
241-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo"
241+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo"
242242
}
243243

244244
parameter_meta {
@@ -293,7 +293,7 @@ task structured_comments {
293293

294294
File? filter_to_ids
295295

296-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
296+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
297297
}
298298
String out_base = basename(assembly_stats_tsv, '.txt')
299299
command <<<
@@ -346,7 +346,7 @@ task structured_comments_from_aligned_bam {
346346
String out_basename = basename(aligned_bam, '.bam')
347347
Boolean is_genome_assembly = true
348348
Boolean sanitize_ids = true
349-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
349+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
350350
}
351351
# see https://www.ncbi.nlm.nih.gov/genbank/structuredcomment/
352352
command <<<
@@ -465,7 +465,7 @@ task rename_fasta_header {
465465

466466
String out_basename = basename(genome_fasta, ".fasta")
467467

468-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
468+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
469469
}
470470
command <<<
471471
set -e
@@ -630,7 +630,7 @@ task sra_meta_prep {
630630
Boolean paired
631631

632632
String out_name = "sra_metadata.tsv"
633-
String docker="ghcr.io/broadinstitute/viral-ngs:3.0.5-core"
633+
String docker="ghcr.io/broadinstitute/viral-ngs:3.0.6-core"
634634
}
635635
Int disk_size = 100
636636
parameter_meta {
@@ -1246,7 +1246,7 @@ task table2asn {
12461246

12471247
String out_basename = basename(assembly_fasta, ".fasta")
12481248
Int machine_mem_gb = 8
1249-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-phylo" # this could be a simpler docker image, we don't use anything beyond table2asn itself
1249+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-phylo" # this could be a simpler docker image, we don't use anything beyond table2asn itself
12501250
}
12511251
Int disk_size = 50
12521252

@@ -1338,7 +1338,7 @@ task package_special_genbank_ftp_submission {
13381338
String account_name
13391339
String wizard="BankIt_SARSCoV2_api"
13401340

1341-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-baseimage"
1341+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-baseimage"
13421342
}
13431343
command <<<
13441344
set -e
@@ -1403,7 +1403,7 @@ task genbank_special_taxa {
14031403
Int taxid
14041404
File taxdump_tgz
14051405
File vadr_by_taxid_tsv # "gs://pathogen-public-dbs/viral-references/annotation/vadr/vadr-by-taxid.tsv"
1406-
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.5-classify"
1406+
String docker = "ghcr.io/broadinstitute/viral-ngs:3.0.6-classify"
14071407
}
14081408

14091409
command <<<

0 commit comments

Comments
 (0)