Skip to content

Commit

Permalink
bump viral-ngs docker dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
dpark01 committed Mar 23, 2021
1 parent 0165f36 commit ee8d68c
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 57 deletions.
14 changes: 7 additions & 7 deletions pipes/WDL/tasks/tasks_assembly.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ task assemble {
String sample_name = basename(basename(reads_unmapped_bam, ".bam"), ".taxfilt")

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-assemble:2.1.16.1"
String docker="quay.io/broadinstitute/viral-assemble:2.1.20.0"
}

command {
Expand Down Expand Up @@ -80,7 +80,7 @@ task scaffold {
Float? scaffold_min_pct_contig_aligned

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-assemble:2.1.16.1"
String docker="quay.io/broadinstitute/viral-assemble:2.1.20.0"

# do this in multiple steps in case the input doesn't actually have "assembly1-x" in the name
String sample_name = basename(basename(contigs_fasta, ".fasta"), ".assembly1-spades")
Expand Down Expand Up @@ -295,7 +295,7 @@ task align_reads {
Boolean? skip_mark_dupes=false
Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
String sample_name = basename(basename(basename(reads_unmapped_bam, ".bam"), ".taxfilt"), ".clean")
}
Expand Down Expand Up @@ -411,7 +411,7 @@ task refine_assembly_with_aligned_reads {
Int? min_coverage=3
Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-assemble:2.1.16.1"
String docker="quay.io/broadinstitute/viral-assemble:2.1.20.0"
}
parameter_meta {
Expand Down Expand Up @@ -510,7 +510,7 @@ task refine {
Int? min_coverage=1
Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-assemble:2.1.16.1"
String docker="quay.io/broadinstitute/viral-assemble:2.1.20.0"
String assembly_basename=basename(basename(assembly_fasta, ".fasta"), ".scaffold")
}
Expand Down Expand Up @@ -580,7 +580,7 @@ task refine_2x_and_plot {
String? plot_coverage_novoalign_options="-r Random -l 40 -g 40 -x 20 -t 100 -k"
Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-assemble:2.1.16.1"
String docker="quay.io/broadinstitute/viral-assemble:2.1.20.0"
# do this in two steps in case the input doesn't actually have "cleaned" in the name
String sample_name = basename(basename(reads_unmapped_bam, ".bam"), ".cleaned")
Expand Down Expand Up @@ -712,7 +712,7 @@ task run_discordance {
String out_basename = "run"
Int min_coverage=4
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}
command {
Expand Down
4 changes: 2 additions & 2 deletions pipes/WDL/tasks/tasks_demux.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ task merge_tarballs {
String out_filename

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}

command {
Expand Down Expand Up @@ -101,7 +101,7 @@ task illumina_demux {
Boolean? forceGC=true
Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}
parameter_meta {
flowcell_tgz: {
Expand Down
8 changes: 4 additions & 4 deletions pipes/WDL/tasks/tasks_interhost.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ task multi_align_mafft_ref {
Float? mafft_gapOpeningPenalty

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker="quay.io/broadinstitute/viral-phylo:2.1.20.0"
}

String fasta_basename = basename(reference_fasta, '.fasta')
Expand Down Expand Up @@ -53,7 +53,7 @@ task multi_align_mafft {
Float? mafft_gapOpeningPenalty

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker="quay.io/broadinstitute/viral-phylo:2.1.20.0"
}

command {
Expand Down Expand Up @@ -142,7 +142,7 @@ task index_ref {
File? novocraft_license

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}

command {
Expand Down Expand Up @@ -252,7 +252,7 @@ task merge_vcfs_gatk {
File ref_fasta

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker="quay.io/broadinstitute/viral-phylo:2.1.20.0"

String output_prefix = "merged"
}
Expand Down
6 changes: 3 additions & 3 deletions pipes/WDL/tasks/tasks_intrahost.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ task isnvs_per_sample {
Boolean removeDoublyMappedReads=true

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker="quay.io/broadinstitute/viral-phylo:2.1.20.0"

String sample_name = basename(basename(basename(mapped_bam, ".bam"), ".all"), ".mapped")
}
Expand Down Expand Up @@ -52,7 +52,7 @@ task isnvs_vcf {
Boolean naiveFilter=false

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker="quay.io/broadinstitute/viral-phylo:2.1.20.0"
}

parameter_meta {
Expand Down Expand Up @@ -125,7 +125,7 @@ task annotate_vcf_snpeff {
String? emailAddress

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker="quay.io/broadinstitute/viral-phylo:2.1.20.0"

String output_basename = basename(basename(in_vcf, ".gz"), ".vcf")
}
Expand Down
16 changes: 8 additions & 8 deletions pipes/WDL/tasks/tasks_metagenomics.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ task krakenuniq {
File krona_taxonomy_db_tgz # taxonomy.tab
Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-classify:2.1.16.0"
String docker="quay.io/broadinstitute/viral-classify:2.1.20.0"
}

parameter_meta {
Expand Down Expand Up @@ -136,7 +136,7 @@ task build_krakenuniq_db {
Int? zstd_compression_level

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-classify:2.1.16.0"
String docker="quay.io/broadinstitute/viral-classify:2.1.20.0"
}

command {
Expand Down Expand Up @@ -202,7 +202,7 @@ task kraken2 {
Int? min_base_qual

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-classify:2.1.16.0"
String docker="quay.io/broadinstitute/viral-classify:2.1.20.0"
}

parameter_meta {
Expand Down Expand Up @@ -334,7 +334,7 @@ task build_kraken2_db {
Int? zstd_compression_level

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-classify:2.1.16.0"
String docker="quay.io/broadinstitute/viral-classify:2.1.20.0"
}

parameter_meta {
Expand Down Expand Up @@ -472,7 +472,7 @@ task blastx {
File krona_taxonomy_db_tgz

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-classify:2.1.16.0"
String docker="quay.io/broadinstitute/viral-classify:2.1.20.0"
}

parameter_meta {
Expand Down Expand Up @@ -559,7 +559,7 @@ task krona {
Int? magnitude_column

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-classify:2.1.16.0"
String docker="quay.io/broadinstitute/viral-classify:2.1.20.0"
}

command {
Expand Down Expand Up @@ -658,7 +658,7 @@ task filter_bam_to_taxa {
String out_filename_suffix = "filtered"

Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-classify:2.1.16.0"
String docker="quay.io/broadinstitute/viral-classify:2.1.20.0"
}

String out_basename = basename(classified_bam, ".bam") + "." + out_filename_suffix
Expand Down Expand Up @@ -743,7 +743,7 @@ task kaiju {
File krona_taxonomy_db_tgz # taxonomy/taxonomy.tab
Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-classify:2.1.16.0"
String docker="quay.io/broadinstitute/viral-classify:2.1.20.0"
}

String input_basename = basename(reads_unmapped_bam, ".bam")
Expand Down
18 changes: 9 additions & 9 deletions pipes/WDL/tasks/tasks_ncbi.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ task download_fasta {
Array[String]+ accessions
String emailAddress

String docker="quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker="quay.io/broadinstitute/viral-phylo:2.1.20.0"
}

command {
Expand Down Expand Up @@ -56,7 +56,7 @@ task download_annotations {
String emailAddress
String combined_out_prefix

String docker="quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker="quay.io/broadinstitute/viral-phylo:2.1.20.0"
}

command {
Expand Down Expand Up @@ -100,7 +100,7 @@ task annot_transfer {
File reference_fasta
Array[File]+ reference_feature_table

String docker="quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker="quay.io/broadinstitute/viral-phylo:2.1.20.0"
}

parameter_meta {
Expand Down Expand Up @@ -153,7 +153,7 @@ task align_and_annot_transfer_single {
Array[File]+ reference_fastas
Array[File]+ reference_feature_tables

String docker="quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker="quay.io/broadinstitute/viral-phylo:2.1.20.0"
}

parameter_meta {
Expand Down Expand Up @@ -205,7 +205,7 @@ task structured_comments {

File? filter_to_ids

String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}
String out_base = basename(assembly_stats_tsv, '.txt')
command <<<
Expand Down Expand Up @@ -283,7 +283,7 @@ task rename_fasta_header {
String out_basename = basename(genome_fasta, ".fasta")
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}
command {
set -e
Expand Down Expand Up @@ -421,7 +421,7 @@ task sra_meta_prep {
Boolean paired
String out_name = "sra_metadata.tsv"
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}
parameter_meta {
cleaned_bam_filepaths: {
Expand Down Expand Up @@ -583,7 +583,7 @@ task biosample_to_genbank {
File? filter_to_ids
Boolean s_dropout_note=true
String docker="quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker="quay.io/broadinstitute/viral-phylo:2.1.20.0"
}
String base = basename(biosample_attributes, ".txt")
command {
Expand Down Expand Up @@ -635,7 +635,7 @@ task prepare_genbank {
String? assembly_method_version
Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker="quay.io/broadinstitute/viral-phylo:2.1.20.0"
}
parameter_meta {
Expand Down
6 changes: 3 additions & 3 deletions pipes/WDL/tasks/tasks_nextstrain.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ task derived_cols {
String? lab_highlight_loc
Array[File] table_map=[]
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}
parameter_meta {
lab_highlight_loc: {
Expand Down Expand Up @@ -541,7 +541,7 @@ task filter_sequences_by_length {
File sequences_fasta
Int min_non_N = 1
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}
parameter_meta {
sequences_fasta: {
Expand Down Expand Up @@ -690,7 +690,7 @@ task mafft_one_chr {
Boolean large = false
Boolean memsavetree = false
String docker = "quay.io/broadinstitute/viral-phylo:2.1.19.1"
String docker = "quay.io/broadinstitute/viral-phylo:2.1.20.0"
Int mem_size = 500
Int cpus = 64
}
Expand Down
10 changes: 5 additions & 5 deletions pipes/WDL/tasks/tasks_read_utils.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ task get_sample_meta {
input {
Array[File] samplesheets_extended
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}
command <<<
python3 << CODE
Expand Down Expand Up @@ -137,7 +137,7 @@ task merge_and_reheader_bams {
File? reheader_table
String out_basename
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}
command {
Expand Down Expand Up @@ -197,7 +197,7 @@ task rmdup_ubam {
String method="mvicuna"
Int? machine_mem_gb
String? docker="quay.io/broadinstitute/viral-core:2.1.19"
String? docker="quay.io/broadinstitute/viral-core:2.1.20"
}
parameter_meta {
Expand Down Expand Up @@ -251,7 +251,7 @@ task downsample_bams {
Boolean? deduplicateAfter=false
Int? machine_mem_gb
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}
command {
Expand Down Expand Up @@ -310,7 +310,7 @@ task FastqToUBAM {
String? platform_name
String? sequencing_center
String docker="quay.io/broadinstitute/viral-core:2.1.19"
String docker="quay.io/broadinstitute/viral-core:2.1.20"
}
parameter_meta {
fastq_1: { description: "Unaligned read1 file in fastq format", patterns: ["*.fastq", "*.fastq.gz", "*.fq", "*.fq.gz"] }
Expand Down
Loading

0 comments on commit ee8d68c

Please sign in to comment.