Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ which was derived from [Docker Compose file version 3 specification](https://doc
### Unimplemented YAML fields
- Fields that correspond to unimplemented `docker run` flags, e.g., `services.<SERVICE>.links` (corresponds to `docker run --link`)
- Fields that correspond to unimplemented `docker build` flags, e.g., `services.<SERVICE>.build.extra_hosts` (corresponds to `docker build --add-host`)
- `services.<SERVICE>.cgroup_parent`
- `services.<SERVICE>.credential_spec`
- `services.<SERVICE>.deploy.update_config`
- `services.<SERVICE>.deploy.rollback_config`
Expand Down
10 changes: 10 additions & 0 deletions pkg/composer/serviceparser/serviceparser.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ func warnUnknownFields(svc types.ServiceConfig) {
"BlkioConfig",
"CapAdd",
"CapDrop",
"Cgroup",
"CgroupParent",
"CPUS",
"CPUSet",
"CPUShares",
Expand Down Expand Up @@ -562,6 +564,14 @@ func newContainer(project *types.Project, parsed *Service, i int) (*Container, e
c.RunArgs = append(c.RunArgs, fmt.Sprintf("--cpu-shares=%d", svc.CPUShares))
}

if svc.Cgroup != "" {
c.RunArgs = append(c.RunArgs, fmt.Sprintf("--cgroupns=%s", svc.Cgroup))
}

if svc.CgroupParent != "" {
c.RunArgs = append(c.RunArgs, fmt.Sprintf("--cgroup-parent=%s", svc.CgroupParent))
}

for _, v := range svc.Devices {
c.RunArgs = append(c.RunArgs, fmt.Sprintf("--device=%s:%s:%s", v.Source, v.Target, v.Permissions))
}
Expand Down
27 changes: 27 additions & 0 deletions pkg/composer/serviceparser/serviceparser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,33 @@ services:
}
}

func TestParseCgroup(t *testing.T) {
const dockerComposeYAML = `
services:
foo:
image: nginx:alpine
cgroup: host
cgroup_parent: foo.slice
`
comp := testutil.NewComposeDir(t, dockerComposeYAML)
defer comp.CleanUp()

project, err := testutil.LoadProject(comp.YAMLFullPath(), comp.ProjectName(), nil)
assert.NilError(t, err)

fooSvc, err := project.GetService("foo")
assert.NilError(t, err)

foo, err := Parse(project, fooSvc)
assert.NilError(t, err)

t.Logf("foo: %+v", foo)
for _, c := range foo.Containers {
assert.Assert(t, in(c.RunArgs, "--cgroupns=host"))
assert.Assert(t, in(c.RunArgs, "--cgroup-parent=foo.slice"))
}
}

func TestParseRelative(t *testing.T) {
t.Parallel()

Expand Down
Loading