Skip to content

Commit b97713f

Browse files
committed
Fix docker syntax
1 parent 28ed55b commit b97713f

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/run/DockerWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void executeWithDocker(List<String> containerArgs, File workDir, Pipeline
5252
writer.println("sudo $DOCKER run --rm=true \\");
5353
writer.println("\t-v \"${WD}:/work\" \\");
5454
writer.println("\t-v \"${HOME}:/homeDir\" \\");
55-
_ctx.getDockerVolumes().forEach(writer::println);
55+
_ctx.getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
5656
if (_tmpDir != null)
5757
{
5858
writer.println("\t-v \"" + _tmpDir.getPath() + ":/tmp\" \\");

SequenceAnalysis/src/org/labkey/sequenceanalysis/analysis/GLNexusHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ public void execute(List<File> inputGvcfs, File outputVcf, PipelineOutputTracker
291291
writer.println("sudo $DOCKER run --rm=true \\");
292292
writer.println("\t-v \"${WD}:/work\" \\");
293293
writer.println("\t-v \"${HOME}:/homeDir\" \\");
294-
ctx.getDockerVolumes().forEach(writer::println);
294+
ctx.getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
295295
writer.println("\t -w /work \\");
296296
if (!StringUtils.isEmpty(System.getenv("TMPDIR")))
297297
{

SequenceAnalysis/src/org/labkey/sequenceanalysis/run/analysis/DeepVariantAnalysis.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ public void execute(File inputBam, File refFasta, File outputGvcf, boolean retai
270270
writer.println("sudo $DOCKER run --rm=true \\");
271271
writer.println("\t-v \"${WD}:/work\" \\");
272272
writer.println("\t-v \"${HOME}:/homeDir\" \\");
273-
ctx.getDockerVolumes().forEach(writer::println);
273+
ctx.getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
274274
if (!StringUtils.isEmpty(System.getenv("TMPDIR")))
275275
{
276276
writer.println("\t-v \"${TMPDIR}:/tmp\" \\");

SequenceAnalysis/src/org/labkey/sequenceanalysis/run/analysis/NextCladeHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public static File runNextClade(File consensusFasta, Logger log, PipelineOutputT
184184
}
185185

186186
writer.println("\t-v \"${WD}:/work\" \\");
187-
ctx.getDockerVolumes().forEach(writer::println);
187+
ctx.getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
188188
writer.println("\t-u $UID \\");
189189
writer.println("\t-e USERID=$UID \\");
190190
writer.println("\t-w /work \\");

SequenceAnalysis/src/org/labkey/sequenceanalysis/run/analysis/PangolinHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ private static File runUsingDocker(File outputDir, Logger log, File consensusFas
308308

309309
String extraArgString = extraArgs == null ? "" : " " + StringUtils.join(extraArgs, " ");
310310
writer.println("\t-v \"${WD}:/work\" \\");
311-
ctx.getDockerVolumes().forEach(writer::println);
311+
ctx.getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
312312
writer.println("\t-u $UID \\");
313313
writer.println("\t-e USERID=$UID \\");
314314
writer.println("\t-w /work \\");

singlecell/api-src/org/labkey/api/singlecell/pipeline/AbstractSingleCellPipelineStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ public static void executeR(SequenceOutputHandler.JobContext ctx, String dockerC
350350
File tmpDir = new File(SequencePipelineService.get().getJavaTempDir());
351351
writer.println("\t-v \"${WD}:/work\" \\");
352352
writer.println("\t-v \"" + tmpDir.getPath() + ":/tmp\" \\");
353-
ctx.getDockerVolumes().forEach(writer::println);
353+
ctx.getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
354354
writer.println("\t-v \"${HOME}:/homeDir\" \\");
355355
writer.println("\t-u $UID \\");
356356
writer.println("\t-e USERID=$UID \\");

singlecell/src/org/labkey/singlecell/CellHashingServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ public File generateCellHashingCalls(File citeSeqCountOutDir, File outputDir, St
13261326

13271327
writer.println("\t-e CELLHASHR_DEBUG=1 \\");
13281328
writer.println("\t-v \"${WD}:/work\" \\");
1329-
ctx.getDockerVolumes().forEach(writer::println);
1329+
ctx.getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
13301330
writer.println("\t-v \"${HOME}:/homeDir\" \\");
13311331
writer.println("\t-u $UID \\");
13321332
writer.println("\t-e USERID=$UID \\");

singlecell/src/org/labkey/singlecell/run/NimbleHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ private boolean runUsingDocker(List<String> nimbleArgs, PipelineStepOutput outpu
592592
writer.println("\t--memory='" + maxRam + "g' \\");
593593
}
594594

595-
getPipelineCtx().getDockerVolumes().forEach(writer::println);
595+
getPipelineCtx().getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
596596
writer.println("\t-v \"${WD}:/work\" \\");
597597
writer.println("\t-v \"${HOME}:/homeDir\" \\");
598598
writer.println("\t-u $UID \\");

0 commit comments

Comments
 (0)