Skip to content

Commit 90f53de

Browse files
dpark01dpark01
authored
Merge pull request #648 from broadinstitute/bump-viral-ngs
bump viral-ngs and nextclade docker images
2 parents e3ca65a + d6ed0e2 commit 90f53de

14 files changed

+88
-88
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 = "quay.io/broadinstitute/viral-ngs:3.0.7-assemble"
19+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-assemble"
2020
}
2121
parameter_meta{
2222
reads_unmapped_bam: {
@@ -124,7 +124,7 @@ task select_references {
124124
Int? skani_c
125125
Int? skani_n
126126

127-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-assemble"
127+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-assemble"
128128
Int machine_mem_gb = 4
129129
Int cpu = 2
130130
Int disk_size = 100
@@ -223,7 +223,7 @@ task scaffold {
223223
Float? scaffold_min_pct_contig_aligned
224224

225225
Int? machine_mem_gb
226-
String docker="quay.io/broadinstitute/viral-ngs:3.0.7-assemble"
226+
String docker="quay.io/broadinstitute/viral-ngs:3.0.8-assemble"
227227

228228
# do this in multiple steps in case the input doesn't actually have "assembly1-x" in the name
229229
String sample_name = basename(basename(contigs_fasta, ".fasta"), ".assembly1-spades")
@@ -475,7 +475,7 @@ task skani_triangle {
475475
Int compression_factor = 10
476476
Int min_aligned_frac = 15
477477

478-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-assemble"
478+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-assemble"
479479
Int machine_mem_gb = 8
480480
Int cpu = 4
481481
Int disk_size = 100
@@ -715,7 +715,7 @@ task align_reads {
715715
716716
Int? cpu
717717
Int? machine_mem_gb
718-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
718+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-core"
719719

720720
String sample_name = basename(basename(basename(reads_unmapped_bam, ".bam"), ".taxfilt"), ".clean")
721721
}
@@ -883,7 +883,7 @@ task refine_assembly_with_aligned_reads {
883883
Int min_coverage = 3
884884

885885
Int machine_mem_gb = 8
886-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-assemble"
886+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-assemble"
887887
}
888888

889889
Int disk_size = 375
@@ -1019,7 +1019,7 @@ task run_discordance {
10191019
String out_basename = "run"
10201020
Int min_coverage = 4
10211021

1022-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
1022+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-core"
10231023
}
10241024
parameter_meta {
10251025
reads_aligned_bam: {
@@ -1266,7 +1266,7 @@ task wgsim {
12661266
Int? random_seed
12671267

12681268
Int machine_mem_gb = 7
1269-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-assemble"
1269+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-assemble"
12701270
}
12711271

12721272
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 = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
9+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-core"
1010
}
1111

1212
Int disk_size = 2625
@@ -179,7 +179,7 @@ task illumina_demux {
179179
Int? machine_mem_gb
180180
# 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)
181181
Int disk_size = 3000
182-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
182+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-core"
183183
}
184184

185185
parameter_meta {
@@ -817,7 +817,7 @@ task get_illumina_run_metadata {
817817
String? sequencing_center
818818

819819
Int? machine_mem_gb
820-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
820+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-core"
821821
}
822822

823823
parameter_meta {
@@ -920,7 +920,7 @@ task demux_fastqs {
920920
Int? machine_mem_gb
921921
Int max_cpu = 32 # Maximum CPU cap for autoscaling (use 16 for 2-barcode, 64 for 3-barcode)
922922
Int disk_size = 750
923-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
923+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-core"
924924
}
925925

926926
# Calculate total input size for autoscaling
@@ -1048,7 +1048,7 @@ task merge_demux_metrics {
10481048
input {
10491049
Array[File]+ metrics_files
10501050
String output_filename = "merged_demux_metrics.txt"
1051-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
1051+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-core"
10521052
}
10531053

10541054
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 = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo"
163+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo"
164164
}
165165

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

208208
Int? machine_mem_gb
209-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo"
209+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo"
210210
}
211211

212212
Int disk_size = 200
@@ -348,7 +348,7 @@ task index_ref {
348348
File? novocraft_license
349349

350350
Int? machine_mem_gb
351-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
351+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-core"
352352
}
353353

354354
Int disk_size = 100
@@ -470,7 +470,7 @@ task merge_vcfs_gatk {
470470
File ref_fasta
471471

472472
Int? machine_mem_gb
473-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo"
473+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo"
474474

475475
String output_prefix = "merged"
476476
}

‎pipes/WDL/tasks/tasks_intrahost.wdl‎

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

137137
String out_basename = basename(aligned_bam, '.bam')
138-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo"
138+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo"
139139
}
140140
Int disk_size = 200
141141
command <<<
@@ -194,7 +194,7 @@ task isnvs_per_sample {
194194
Boolean removeDoublyMappedReads = true
195195

196196
Int? machine_mem_gb
197-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo"
197+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo"
198198

199199
String sample_name = basename(basename(basename(mapped_bam, ".bam"), ".all"), ".mapped")
200200
}
@@ -236,7 +236,7 @@ task isnvs_vcf {
236236
Boolean naiveFilter = false
237237

238238
Int? machine_mem_gb
239-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo"
239+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo"
240240
}
241241

242242
parameter_meta {
@@ -309,7 +309,7 @@ task annotate_vcf_snpeff {
309309
String? emailAddress
310310

311311
Int? machine_mem_gb
312-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo"
312+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo"
313313

314314
String output_basename = basename(basename(in_vcf, ".gz"), ".vcf")
315315
}

‎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 = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
18+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-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 = "quay.io/broadinstitute/viral-ngs:3.0.7-classify"
78+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-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
@@ -216,7 +216,7 @@ task kraken2 {
216216
Int? min_base_qual
217217

218218
Int machine_mem_gb = 90
219-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-classify"
219+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-classify"
220220
}
221221

222222
parameter_meta {
@@ -348,7 +348,7 @@ task report_primary_kraken_taxa {
348348
File kraken_summary_report
349349
String focal_taxon = "Viruses"
350350

351-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-classify"
351+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-classify"
352352
}
353353
String out_basename = basename(kraken_summary_report, '.txt')
354354
Int disk_size = 50
@@ -398,7 +398,7 @@ task filter_refs_to_found_taxa {
398398
File taxdump_tgz
399399
Int min_read_count = 100
400400

401-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-classify"
401+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-classify"
402402
}
403403
String ref_basename = basename(taxid_to_ref_accessions_tsv, '.tsv')
404404
String hits_basename = basename(focal_report_tsv, '.tsv')
@@ -448,7 +448,7 @@ task build_kraken2_db {
448448
Int? zstd_compression_level
449449

450450
Int machine_mem_gb = 100
451-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-classify"
451+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-classify"
452452
}
453453

454454
Int disk_size = 750
@@ -589,7 +589,7 @@ task blastx {
589589
File krona_taxonomy_db_tgz
590590

591591
Int machine_mem_gb = 8
592-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-classify"
592+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-classify"
593593
}
594594

595595
parameter_meta {
@@ -678,7 +678,7 @@ task krona {
678678
Int? magnitude_column
679679

680680
Int machine_mem_gb = 3
681-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-classify"
681+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-classify"
682682
}
683683

684684
Int disk_size = 50
@@ -783,7 +783,7 @@ task filter_bam_to_taxa {
783783
String out_filename_suffix = "filtered"
784784

785785
Int machine_mem_gb = 8
786-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-classify"
786+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-classify"
787787
}
788788

789789
String out_basename = basename(classified_bam, ".bam") + "." + out_filename_suffix
@@ -875,7 +875,7 @@ task kaiju {
875875
File krona_taxonomy_db_tgz # taxonomy/taxonomy.tab
876876
877877
Int machine_mem_gb = 100
878-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-classify"
878+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-classify"
879879
}
880880

881881
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 = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo"
9+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo"
1010
}
1111

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

44-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo"
44+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo"
4545
}
4646

4747
command <<<
@@ -92,7 +92,7 @@ task download_annotations {
9292
String emailAddress
9393
String combined_out_prefix
9494

95-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo"
95+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo"
9696
}
9797

9898
command <<<
@@ -133,7 +133,7 @@ task download_ref_genomes_from_tsv {
133133
File ref_genomes_tsv # [tax_id, isolate_prefix, taxname, colon_delim_accession_list]
134134
String emailAddress
135135

136-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo"
136+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo"
137137
}
138138

139139
command <<<
@@ -179,7 +179,7 @@ task sequencing_platform_from_bam {
179179
input {
180180
File bam
181181

182-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
182+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-core"
183183
}
184184

185185
command <<<
@@ -233,7 +233,7 @@ task align_and_annot_transfer_single {
233233

234234
String out_basename = basename(genome_fasta, '.fasta')
235235
Int machine_mem_gb = 30
236-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo"
236+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo"
237237
}
238238

239239
parameter_meta {
@@ -287,7 +287,7 @@ task structured_comments {
287287

288288
File? filter_to_ids
289289

290-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
290+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-core"
291291
}
292292
String out_base = basename(assembly_stats_tsv, '.txt')
293293
command <<<
@@ -339,7 +339,7 @@ task structured_comments_from_aligned_bam {
339339
String out_basename = basename(aligned_bam, '.bam')
340340
Boolean is_genome_assembly = true
341341
Boolean sanitize_ids = true
342-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
342+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-core"
343343
}
344344
# see https://www.ncbi.nlm.nih.gov/genbank/structuredcomment/
345345
command <<<
@@ -456,7 +456,7 @@ task rename_fasta_header {
456456

457457
String out_basename = basename(genome_fasta, ".fasta")
458458

459-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-core"
459+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-core"
460460
}
461461
command <<<
462462
set -e
@@ -618,7 +618,7 @@ task sra_meta_prep {
618618
Boolean paired
619619

620620
String out_name = "sra_metadata.tsv"
621-
String docker="quay.io/broadinstitute/viral-ngs:3.0.7-core"
621+
String docker="quay.io/broadinstitute/viral-ngs:3.0.8-core"
622622
}
623623
Int disk_size = 100
624624
parameter_meta {
@@ -1230,7 +1230,7 @@ task table2asn {
12301230

12311231
String out_basename = basename(assembly_fasta, ".fasta")
12321232
Int machine_mem_gb = 8
1233-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-phylo" # this could be a simpler docker image, we don't use anything beyond table2asn itself
1233+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-phylo" # this could be a simpler docker image, we don't use anything beyond table2asn itself
12341234
}
12351235
Int disk_size = 50
12361236

@@ -1321,7 +1321,7 @@ task package_special_genbank_ftp_submission {
13211321
String account_name
13221322
String wizard="BankIt_SARSCoV2_api"
13231323

1324-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-baseimage"
1324+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-baseimage"
13251325
}
13261326
command <<<
13271327
set -e
@@ -1385,7 +1385,7 @@ task genbank_special_taxa {
13851385
Int taxid
13861386
File taxdump_tgz
13871387
File vadr_by_taxid_tsv # "gs://pathogen-public-dbs/viral-references/annotation/vadr/vadr-by-taxid.tsv"
1388-
String docker = "quay.io/broadinstitute/viral-ngs:3.0.7-classify"
1388+
String docker = "quay.io/broadinstitute/viral-ngs:3.0.8-classify"
13891389
}
13901390

13911391
command <<<

0 commit comments

Comments
 (0)