wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmd/create: Simplify code

Browse source 
Fallout from 8e80dd5db1

https://github.com/containers/toolbox/pull/1256
This commit is contained in:
Debarshi Ray 2023-03-07 17:20:50 +01:00
parent aeae18920b
commit fb15655ace
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cmd/create.go
View file

@ -254,8 +254,6 @@ func createContainer(container, image, release, authFile string, showCommandToEn
devPtsMount = []string{"--mount", "type=devpts,destination=/dev/pts"} devPtsMount = []string{"--mount", "type=devpts,destination=/dev/pts"}
} }
ulimitHost := []string{"--ulimit", "host"}
var usernsArg string var usernsArg string
if currentUser.Uid == "0" { if currentUser.Uid == "0" {
usernsArg = "host" usernsArg = "host"
@ -417,11 +415,7 @@ func createContainer(container, image, release, authFile string, showCommandToEn
"--pid", "host", "--pid", "host",
"--privileged", "--privileged",
"--security-opt", "label=disable", "--security-opt", "label=disable",
}...) "--ulimit", "host",
createArgs = append(createArgs, ulimitHost...)
createArgs = append(createArgs, []string{
"--userns", usernsArg, "--userns", usernsArg,
"--user", "root:root", "--user", "root:root",
"--volume", "/:/run/host:rslave", "--volume", "/:/run/host:rslave",