summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-28 19:19:12 +0200
committerGitHub <noreply@github.com>2020-04-28 19:19:12 +0200
commit8f57f312d6c22b0c7c25f415872177f2ef9a0c7e (patch)
treeeb38c62b41bb19d52a2ce42dcc648067d595440f /cmd/podman
parent4ed125f7b5228b3e5898e23fbb91d6db8b9a6c18 (diff)
parente8e00133c1624a772434cd23d8e976a803b0cc15 (diff)
downloadpodman-8f57f312d6c22b0c7c25f415872177f2ef9a0c7e.tar.gz
podman-8f57f312d6c22b0c7c25f415872177f2ef9a0c7e.tar.bz2
podman-8f57f312d6c22b0c7c25f415872177f2ef9a0c7e.zip
Merge pull request #6020 from giuseppe/fix-exec
v2, podman: fix create tests
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/common/specgen.go18
-rw-r--r--cmd/podman/containers/exec.go2
2 files changed, 1 insertions, 19 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index 5d5816ea4..f8c58f1a4 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -466,24 +466,6 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
s.CgroupParent = c.CGroupParent
s.CgroupsMode = c.CGroupsMode
s.Groups = c.GroupAdd
- // TODO WTF
- //cgroup := &cc.CgroupConfig{
- // Cgroupns: c.String("cgroupns"),
- //}
- //
- //userns := &cc.UserConfig{
- // GroupAdd: c.StringSlice("group-add"),
- // IDMappings: idmappings,
- // UsernsMode: usernsMode,
- // User: user,
- //}
- //
- //uts := &cc.UtsConfig{
- // UtsMode: utsMode,
- // NoHosts: c.Bool("no-hosts"),
- // HostAdd: c.StringSlice("add-host"),
- // Hostname: c.String("hostname"),
- //}
s.Hostname = c.Hostname
sysctl := map[string]string{}
diff --git a/cmd/podman/containers/exec.go b/cmd/podman/containers/exec.go
index 3749c934a..2bff8ae33 100644
--- a/cmd/podman/containers/exec.go
+++ b/cmd/podman/containers/exec.go
@@ -70,7 +70,7 @@ func init() {
registry.Commands = append(registry.Commands, registry.CliCommand{
Mode: []entities.EngineMode{entities.ABIMode},
Command: containerExecCommand,
- Parent: containerCommitCommand,
+ Parent: containerCmd,
})
containerExecFlags := containerExecCommand.Flags()