-
Notifications
You must be signed in to change notification settings - Fork 98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
TASK-5513 Fix the Docker image configuration for OpenCGA analysis #2389
Conversation
…onfiguration file, #TASK-5513
@@ -140,7 +141,16 @@ protected void run() throws Exception { | |||
|
|||
// And finally, link the BW file is necessary |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of manually "moving and linking" the file, there is a method OpenCgaTool#moveFile
that you could use, which moves, links and associates the file with the job
// Execute R script in docker | ||
AbstractMap.SimpleEntry<String, String> outputBinding = new AbstractMap.SimpleEntry<>(outDir.toAbsolutePath().toString(), | ||
"/data/output"); | ||
String rParams = "R CMD Rscript --vanilla /data/input/" + inputFile.getName(); | ||
try { | ||
String cmdline = DockerUtils.run(MutationalSignatureLocalAnalysisExecutor.R_DOCKER_IMAGE, null, outputBinding, rParams, null); | ||
System.out.println("Docker command line: " + cmdline); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😎
@@ -21,6 +21,9 @@ | |||
|
|||
public abstract class PedigreeGraphAnalysisExecutor extends OpenCgaToolExecutor { | |||
|
|||
public static final String ID = "pedigree-graph"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that usually ID+Description constants are in the main analysis, rather than in the executor
/** | ||
* Created by jtarraga on 24/01/24. | ||
*/ | ||
public class Docker { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd have called this "DockerConfig" or something different, as "Docker" alone might be confusing
Resolve conflicts: opencga-analysis/src/main/java/org/opencb/opencga/analysis/alignment/AlignmentCoverageAnalysis.java opencga-analysis/src/main/java/org/opencb/opencga/analysis/family/qc/IBDComputation.java opencga-analysis/src/main/java/org/opencb/opencga/analysis/individual/qc/IndividualQcUtils.java opencga-analysis/src/main/java/org/opencb/opencga/analysis/individual/qc/InferredSexComputation.java opencga-analysis/src/main/java/org/opencb/opencga/analysis/wrappers/executors/DockerWrapperAnalysisExecutor.java opencga-analysis/src/test/java/org/opencb/opencga/analysis/alignment/AlignmentAnalysisTest.java opencga-core/src/main/java/org/opencb/opencga/core/config/Analysis.java
Add Docker images into the configuration file