Skip to content

Commit

Permalink
🎨🐳 Replace jason-c-kwan with jasonkwan for docker images (#217)
Browse files Browse the repository at this point in the history
  • Loading branch information
evanroyrees authored Jan 12, 2022
1 parent cf23ce3 commit 3c65a57
Show file tree
Hide file tree
Showing 19 changed files with 25 additions and 25 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ install: setup.py
test_environment: tests/requirements.txt
python3 -m pip install --requirement=tests/requirements.txt

## Build docker image from Dockerfile (auto-taggged as jason-c-kwan/autometa:<current-branch>)
## Build docker image from Dockerfile (auto-taggged as jasonkwan/autometa:<current-branch>)
image: Dockerfile
docker build . -t jason-c-kwan/autometa:`git branch --show-current`
docker build . -t jasonkwan/autometa:`git branch --show-current`

## Build necessary docker images for nextflow modules from Dockerfiles in docker/modules
modules-images: docker/modules/get_genomes_for_mock.Dockerfile docker/modules/mock_data_reporter.Dockerfile
docker build docker/modules/ -t jason-c-kwan/autometa-nf-modules-get_genomes_for_mock -f docker/modules/get_genomes_for_mock.Dockerfile
docker build docker/modules/ -t jason-c-kwan/autometa-nf-modules-mock_data_reporter -f docker/modules/mock_data_reporter.Dockerfile
docker build docker/modules/ -t jasonkwan/autometa-nf-modules-get_genomes_for_mock -f docker/modules/get_genomes_for_mock.Dockerfile
docker build docker/modules/ -t jasonkwan/autometa-nf-modules-mock_data_reporter -f docker/modules/mock_data_reporter.Dockerfile

## Build documentation for autometa.readthedocs.io
docs:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/analyze_kmers.nf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ process ANALYZE_KMERS {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/autometa"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/bin_contigs.nf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ process BIN_CONTIGS {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/binning_summary.nf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ process BINNING_SUMMARY {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/get_genomes_for_mock.nf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ process GET_GENOMES_FOR_MOCK {
def genome_count = options.args2.tokenize('|').size()
tag "fetching ${genome_count} genomes"
conda (params.enable_conda ? "bioconda::emboss=6.6.0" : null)
container "jason-c-kwan/autometa-nf-modules-get_genomes_for_mock"
container "jasonkwan/autometa-nf-modules-get_genomes_for_mock"

output:
path "metagenome.fna.gz", emit: metagenome
Expand Down
2 changes: 1 addition & 1 deletion modules/local/hmmer_hmmsearch_filter.nf
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ process HMMER_HMMSEARCH_FILTER {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/length_table.nf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ process LENGTH_TABLE {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/majority_vote.nf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ process MAJORITY_VOTE {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/markers.nf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ process MARKERS {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/merge_tsv.nf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ process MERGE_TSV_WITH_HEADERS {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/mock_data_reporter.nf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ process MOCK_DATA_REPORT {
publishDir "${params.outdir_internal}/${options.publish_dir}",
mode: params.publish_dir_mode

container "jason-c-kwan/autometa-nf-modules-mock_data_reporter"
container "jasonkwan/autometa-nf-modules-mock_data_reporter"


input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/parse_bed.nf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ process PARSE_BED {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/bedtools:2.30.0--hc088bd4_0"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/prepare_lca.nf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ process PREPARE_LCA {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

storeDir 'db/lca'
Expand Down
2 changes: 1 addition & 1 deletion modules/local/reduce_lca.nf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ process REDUCE_LCA {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/spades_kmer_coverage.nf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ process SPADES_KMER_COVERAGE {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/split_kingdoms.nf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ process SPLIT_KINGDOMS {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
2 changes: 1 addition & 1 deletion modules/local/unclustered_recruitment.nf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ process RECRUIT {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

input:
Expand Down
6 changes: 3 additions & 3 deletions subworkflows/local/prepare_ncbi_taxinfo.nf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ process TEST_DOWNLOAD {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

output:
Expand All @@ -40,7 +40,7 @@ process DOWNLOAD_ACESSION2TAXID {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

output:
Expand Down Expand Up @@ -73,7 +73,7 @@ process DOWNLOAD_TAXDUMP {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

output:
Expand Down
4 changes: 2 additions & 2 deletions subworkflows/local/prepare_nr.nf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ process DOWNLOAD_NR {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

output:
Expand Down Expand Up @@ -48,7 +48,7 @@ process TEST_DOWNLOAD {
if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
container "https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE"
} else {
container "jason-c-kwan/autometa:${params.autometa_image_tag}"
container "jasonkwan/autometa:${params.autometa_image_tag}"
}

output:
Expand Down

0 comments on commit 3c65a57

Please sign in to comment.