Skip to content

Commit bf2cb04

Browse files
committed
Drop UID from docker
1 parent 5049933 commit bf2cb04

File tree

7 files changed

+0
-14
lines changed

7 files changed

+0
-14
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,6 @@ public void execute(List<File> inputGvcfs, File outputVcf, PipelineOutputTracker
297297
{
298298
writer.println("\t-v \"${TMPDIR}:/tmp\" \\");
299299
}
300-
writer.println("\t-u $UID \\");
301-
writer.println("\t-e USERID=$UID \\");
302300

303301
Integer maxRam = SequencePipelineService.get().getMaxRam();
304302
if (maxRam != null)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,6 @@ public void execute(File inputBam, File refFasta, File outputGvcf, boolean retai
275275
{
276276
writer.println("\t-v \"${TMPDIR}:/tmp\" \\");
277277
}
278-
writer.println("\t-u $UID \\");
279-
writer.println("\t-e USERID=$UID \\");
280278
writer.println("\t--entrypoint /bin/bash \\");
281279
writer.println("\t-w /work \\");
282280
Integer maxRam = SequencePipelineService.get().getMaxRam();

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ public static File runNextClade(File consensusFasta, Logger log, PipelineOutputT
185185

186186
writer.println("\t-v \"${WD}:/work\" \\");
187187
ctx.getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
188-
writer.println("\t-u $UID \\");
189-
writer.println("\t-e USERID=$UID \\");
190188
writer.println("\t-w /work \\");
191189
writer.println("\tnextstrain/nextclade:latest \\");
192190
writer.println("\t/bin/bash -c \"nextclade dataset get --name='sars-cov-2' --output-dir='/work/data/sars-cov-2';nextclade run --input-dataset='/work/data/sars-cov-2' --output-json '/work/" + jsonFile.getName() + "' '" + consensusFasta.getName() + "'\" && rm -Rf /work/data");

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,6 @@ private static File runUsingDocker(File outputDir, Logger log, File consensusFas
309309
String extraArgString = extraArgs == null ? "" : " " + StringUtils.join(extraArgs, " ");
310310
writer.println("\t-v \"${WD}:/work\" \\");
311311
ctx.getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
312-
writer.println("\t-u $UID \\");
313-
writer.println("\t-e USERID=$UID \\");
314312
writer.println("\t-w /work \\");
315313
writer.println("\tghcr.io/bimberlabinternal/pangolin:latest \\");
316314
writer.println("\tpangolin" + extraArgString + " '/work/" + consensusFasta.getName() + "'");

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,6 @@ public static void executeR(SequenceOutputHandler.JobContext ctx, String dockerC
352352
writer.println("\t-v \"" + tmpDir.getPath() + ":/tmp\" \\");
353353
ctx.getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
354354
writer.println("\t-v \"${HOME}:/homeDir\" \\");
355-
writer.println("\t-u $UID \\");
356-
writer.println("\t-e USERID=$UID \\");
357355
writer.println("\t-e TMPDIR=/tmp \\");
358356
if (dockerHomeDir != null)
359357
{

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,8 +1328,6 @@ public File generateCellHashingCalls(File citeSeqCountOutDir, File outputDir, St
13281328
writer.println("\t-v \"${WD}:/work\" \\");
13291329
ctx.getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
13301330
writer.println("\t-v \"${HOME}:/homeDir\" \\");
1331-
writer.println("\t-u $UID \\");
1332-
writer.println("\t-e USERID=$UID \\");
13331331
writer.println("\t-w /work \\");
13341332
writer.println("\tghcr.io/bimberlab/cellhashr:latest \\");
13351333
writer.println("\tRscript --vanilla " + localRScript.getName());

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,10 +608,8 @@ private static boolean runUsingDocker(List<String> nimbleArgs, PipelineStepOutpu
608608
ctx.getDockerVolumes().forEach(ln -> writer.println(ln + " \\"));
609609
writer.println("\t-v \"${WD}:/work\" \\");
610610
writer.println("\t-v \"${HOME}:/homeDir\" \\");
611-
writer.println("\t-u $UID \\");
612611
writer.println("\t-e RUST_BACKTRACE=1 \\");
613612
writer.println("\t-e TMPDIR=/work/tmpDir \\");
614-
writer.println("\t-e USERID=$UID \\");
615613
writer.println("\t--entrypoint /bin/bash \\");
616614
writer.println("\t-w /work \\");
617615
writer.println("\t" + DOCKER_CONTAINER_NAME + " \\");

0 commit comments

Comments
 (0)