Fix image pull and gender arg for WES
- Push as Docker V2 manifest (no OCI index/attestation) so K8s can pull - Tag as v3 to avoid cached image issues - Fix gender: omit -g flag for 0.5 (both), Synthea only accepts M or F
This commit is contained in:
6
main.nf
6
main.nf
@@ -22,7 +22,7 @@ if (!params.outdir) {
|
|||||||
|
|
||||||
// Process to generate synthetic patients
|
// Process to generate synthetic patients
|
||||||
process generatePatients {
|
process generatePatients {
|
||||||
container 'harbor.cluster.omic.ai/omic/synthea-alldiseases:v2'
|
container 'harbor.cluster.omic.ai/omic/synthea-alldiseases:v3'
|
||||||
publishDir params.outdir, mode: 'copy'
|
publishDir params.outdir, mode: 'copy'
|
||||||
|
|
||||||
input:
|
input:
|
||||||
@@ -34,13 +34,13 @@ process generatePatients {
|
|||||||
|
|
||||||
script:
|
script:
|
||||||
def moduleBasename = diseaseName.toLowerCase().replaceAll(' ', '_')
|
def moduleBasename = diseaseName.toLowerCase().replaceAll(' ', '_')
|
||||||
def genderArg = params.gender < 0.5 ? "M" : (params.gender > 0.5 ? "F" : "B")
|
def genderArg = params.gender < 0.5 ? "-g M" : (params.gender > 0.5 ? "-g F" : "")
|
||||||
def seedArg = params.seed ? "-s ${params.seed}" : ""
|
def seedArg = params.seed ? "-s ${params.seed}" : ""
|
||||||
"""
|
"""
|
||||||
# Use pre-built jar directly (bypasses Gradle which needs write access to .gradle)
|
# Use pre-built jar directly (bypasses Gradle which needs write access to .gradle)
|
||||||
cd /app && java -jar /app/build/libs/synthea-with-dependencies.jar \
|
cd /app && java -jar /app/build/libs/synthea-with-dependencies.jar \
|
||||||
-p ${params.population} \
|
-p ${params.population} \
|
||||||
-g ${genderArg} \
|
${genderArg} \
|
||||||
-a ${params.min_age}-${params.max_age} \
|
-a ${params.min_age}-${params.max_age} \
|
||||||
${seedArg} 2>&1 | tee run.log
|
${seedArg} 2>&1 | tee run.log
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ profiles {
|
|||||||
k8s {
|
k8s {
|
||||||
process {
|
process {
|
||||||
executor = 'k8s'
|
executor = 'k8s'
|
||||||
container = 'harbor.cluster.omic.ai/omic/synthea-alldiseases:v2'
|
container = 'harbor.cluster.omic.ai/omic/synthea-alldiseases:v3'
|
||||||
}
|
}
|
||||||
docker {
|
docker {
|
||||||
enabled = true
|
enabled = true
|
||||||
|
|||||||
Reference in New Issue
Block a user