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
7 changes: 7 additions & 0 deletions pkg/composer/serviceparser/serviceparser.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"time"

"github.com/compose-spec/compose-go/v2/types"
cdiparser "tags.cncf.io/container-device-interface/pkg/parser"

"github.com/containerd/log"

Expand Down Expand Up @@ -563,6 +564,12 @@ func newContainer(project *types.Project, parsed *Service, i int) (*Container, e
}

for _, v := range svc.Devices {
// A CDI device is passed by its qualified name alone; `nerdctl run`
// only recognizes the name when nothing is appended to it.
if cdiparser.IsQualifiedName(v.Source) {
c.RunArgs = append(c.RunArgs, fmt.Sprintf("--device=%s", v.Source))
continue
}
c.RunArgs = append(c.RunArgs, fmt.Sprintf("--device=%s:%s:%s", v.Source, v.Target, v.Permissions))
}

Expand Down
2 changes: 2 additions & 0 deletions pkg/composer/serviceparser/serviceparser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ services:
- /dev/a
- /dev/b:/dev/b
- /dev/c:/dev/c:rw
- vendor.com/class=name
`
comp := testutil.NewComposeDir(t, dockerComposeYAML)
defer comp.CleanUp()
Expand All @@ -375,6 +376,7 @@ services:
assert.Assert(t, in(c.RunArgs, "--device=/dev/a:/dev/a:rwm"))
assert.Assert(t, in(c.RunArgs, "--device=/dev/b:/dev/b:rwm"))
assert.Assert(t, in(c.RunArgs, "--device=/dev/c:/dev/c:rw"))
assert.Assert(t, in(c.RunArgs, "--device=vendor.com/class=name"))
}
}

Expand Down
Loading