Skip to content

Commit f6f4c1c

Browse files
committed
Adding changes from nextflow-io#4141
1 parent 0ea74a7 commit f6f4c1c

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

modules/nextflow/src/main/groovy/nextflow/container/ContainerConfig.groovy

+5-3
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,11 @@ class ContainerConfig extends LinkedHashMap {
124124
final eng = getEngine()
125125
if( !eng )
126126
return null
127-
if( eng=='docker' || eng=='podman' )
128-
return '--rm --privileged'
129-
if( isSingularityOciMode() )
127+
if( eng=='docker' )
128+
return '--rm --device /dev/fuse --security-opt apparmor=unconfined --security-opt seccomp=unconfined'
129+
if( eng=='podman' )
130+
return '--rm --device /dev/fuse'
131+
if( singularityOciMode() )
130132
return '-B /dev/fuse'
131133
if( eng=='singularity' || eng=='apptainer' )
132134
return null

plugins/nf-wave/src/main/io/seqera/wave/plugin/cli/WaveDebugCmd.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class WaveDebugCmd {
118118

119119
protected WaveRunCmd buildWaveRunCmd(String scheme) {
120120
final result = new WaveRunCmd(session)
121-
result.withContainerParams([tty:true, privileged: true])
121+
result.withContainerParams([tty:true])
122122
if( scheme=='s3' ) {
123123
result.withEnvironment('AWS_ACCESS_KEY_ID')
124124
result.withEnvironment('AWS_SECRET_ACCESS_KEY')

0 commit comments

Comments
 (0)