Skip to content
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

Closed
wants to merge 7 commits into from

Conversation

jtarraga
Copy link
Member

@jtarraga jtarraga commented Feb 6, 2024

Add Docker images into the configuration file

@jtarraga
Copy link
Member Author

jtarraga commented Feb 6, 2024

@jtarraga jtarraga requested a review from j-coll February 6, 2024 16:28
@jtarraga jtarraga changed the title TASK-5513 TASK-5513 Fix the Docker image configuration for OpenCGA analysis Feb 6, 2024
j-coll
j-coll previously approved these changes Feb 7, 2024
@@ -140,7 +141,16 @@ protected void run() throws Exception {

// And finally, link the BW file is necessary
Copy link
Member

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);
Copy link
Member

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";
Copy link
Member

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 {
Copy link
Member

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
@jtarraga jtarraga closed this Jun 11, 2024
@jtarraga jtarraga deleted the TASK-5513 branch June 11, 2024 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants