Revert use of non-privileged permission [ci fast]

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
nextflow-io · Dec 24, 2022 · 5eaa04a · 5eaa04a
1 parent 9ec3144
commit 5eaa04a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/modules/nextflow/src/main/groovy/nextflow/fusion/FusionHelper.groovy b/modules/nextflow/src/main/groovy/nextflow/fusion/FusionHelper.groovy
@@ -52,8 +52,7 @@ class FusionHelper {
                 .addMountWorkDir(false)
                 .addRunOptions('--rm')
                 .params(containerConfig)
-                .params(device: '/dev/fuse')
-                .params(capAdd: 'SYS_ADMIN')
+                .params(privileged: true)
 
         // add fusion env vars
         for(Map.Entry<String,String> it : launcher.fusionEnv()) {

diff --git a/modules/nextflow/src/test/groovy/nextflow/executor/local/LocalTaskHandlerTest.groovy b/modules/nextflow/src/test/groovy/nextflow/executor/local/LocalTaskHandlerTest.groovy
@@ -76,7 +76,7 @@ class LocalTaskHandlerTest extends Specification {
         then:
         handler.fusionEnabled() >> true
         and:
-        builder.command() == ['sh','-c','docker run -i -e "NXF_FUSION_WORK=/fusion/http/some/work/dir" -e "NXF_FUSION_BUCKETS=http://some" --rm --device /dev/fuse --cap-add SYS_ADMIN ubuntu:latest bash -o pipefail -c \'trap "{ ret=$?; cp .command.log /fusion/http/some/work/dir/.command.log||true; exit $ret; }" EXIT; bash /fusion/http/some/work/dir/.command.run 2>&1 | tee .command.log\'']
+        builder.command() == ['sh','-c','docker run -i -e "NXF_FUSION_WORK=/fusion/http/some/work/dir" -e "NXF_FUSION_BUCKETS=http://some" --rm --privileged ubuntu:latest bash -o pipefail -c \'trap "{ ret=$?; cp .command.log /fusion/http/some/work/dir/.command.log||true; exit $ret; }" EXIT; bash /fusion/http/some/work/dir/.command.run 2>&1 | tee .command.log\'']
         builder.directory() == null
         builder.redirectErrorStream()
         builder.redirectOutput().file()