diff --git a/conf/google.config b/conf/google.config index 852da10..c912002 100644 --- a/conf/google.config +++ b/conf/google.config @@ -1,10 +1,17 @@ params { executor = 'google-lifesciences' dataLocation = 'gs://lifebit-featured-datasets/pipelines/spammer-nf/input_files' + + // Nextflow default values with correction so that all pulled from gcr.io + gls_copyImage = 'gcr.io/google.com/cloudsdktool/cloud-sdk:alpine' + gls_sshImage = 'gcr.io/cloud-genomics-pipelines/tools' } google { - lifeSciences.copyImage = 'gcr.io/google.com/cloudsdktool/cloud-sdk:alpine' + // both images must be hosted in gcr.io of using private ips (gls_usePrivateAddress true) + lifeSciences.copyImage = params.gls_copyImage + lifeSciences.sshImage = params.gls_sshImage + lifeSciences.bootDiskSize = params.gls_bootDiskSize lifeSciences.preemptible = params.gls_preemptible zone = params.zone diff --git a/nextflow.config b/nextflow.config index 07cd3b7..8fe1846 100644 --- a/nextflow.config +++ b/nextflow.config @@ -40,6 +40,10 @@ params { zone = 'us-east1-b' network = 'default' subnetwork = 'default' + + // values defined in conf/google.config + gls_copyImage = false + gls_sshImage = false } // Do not update the order because the values set in params scope will not be overwritten