Add support for devices in swarm

Signed-off-by: zikaeroh <[email protected]>
docker · Dec 24, 2022 · 465e2f5 · 465e2f5
1 parent 139e924
commit 465e2f5
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 75 deletions.
diff --git a/cli/command/service/create.go b/cli/command/service/create.go
@@ -68,6 +68,8 @@ func newCreateCommand(dockerCli command.Cli) *cobra.Command {
 	flags.SetAnnotation(flagSysCtl, "version", []string{"1.40"})
 	flags.Var(&opts.ulimits, flagUlimit, "Ulimit options")
 	flags.SetAnnotation(flagUlimit, "version", []string{"1.41"})
+	flags.Var(&opts.devices, flagDevice, "Devices to add")
+	flags.SetAnnotation(flagDevice, "version", []string{"1.42"})
 
 	flags.Var(cliopts.NewListOptsRef(&opts.resources.resGenericResources, ValidateSingleGenericResource), "generic-resource", "User defined resources")
 	flags.SetAnnotation(flagHostAdd, "version", []string{"1.32"})

diff --git a/cli/command/service/formatter.go b/cli/command/service/formatter.go
@@ -116,6 +116,13 @@ Ulimits:
 {{- range $k, $v := .ContainerUlimits }}
  {{ $k }}: {{ $v }}
 {{- end }}{{ end }}
+{{- if .ContainerDevices }}
+Devices:
+{{- range $port := .ContainerDevices }}
+ PathOnHost = {{ $port.PathOnHost }}
+  PathInContainer = {{ $port.PathInContainer }}
+  CgroupPermissions = {{ $port.CgroupPermissions }}
+{{- end }} {{ end -}}
 {{- if .ContainerMounts }}
 Mounts:
 {{- end }}
@@ -487,6 +494,15 @@ func (ctx *serviceInspectContext) HasContainerUlimits() bool {
 	return len(ctx.Service.Spec.TaskTemplate.ContainerSpec.Ulimits) > 0
 }
 
+
+func (ctx *serviceInspectContext) ContainerDevices() []container.DeviceMapping {
+	return ctx.Service.Spec.TaskTemplate.ContainerSpec.Devices;
+}
+
+func (ctx *serviceInspectContext) HasContainerDevices() bool {
+	return len(ctx.Service.Spec.TaskTemplate.ContainerSpec.Devices) > 0
+}
+
 func (ctx *serviceInspectContext) HasResources() bool {
 	return ctx.Service.Spec.TaskTemplate.Resources != nil
 }

diff --git a/cli/command/service/opts.go b/cli/command/service/opts.go
@@ -513,6 +513,7 @@ type serviceOptions struct {
 	capAdd          opts.ListOpts
 	capDrop         opts.ListOpts
 	ulimits         opts.UlimitOpt
+	devices         opts.ListOpts
 
 	resources resourceOptions
 	stopGrace opts.DurationOpt
@@ -559,6 +560,7 @@ func newServiceOptions() *serviceOptions {
 		capAdd:          opts.NewListOpts(nil),
 		capDrop:         opts.NewListOpts(nil),
 		ulimits:         *opts.NewUlimitOpt(nil),
+		devices:         opts.NewListOpts(nil),
 	}
 }
 
@@ -1024,6 +1026,7 @@ const (
 	flagUlimit                  = "ulimit"
 	flagUlimitAdd               = "ulimit-add"
 	flagUlimitRemove            = "ulimit-rm"
+	flagDevice                  = "device"
 )
 
 func validateAPIVersion(c swarm.ServiceSpec, serverAPIVersion string) error {

diff --git a/cli/compose/convert/service.go b/cli/compose/convert/service.go
@@ -118,6 +118,11 @@ func Service(
 		}
 	}
 
+	devices, err := convertDevices(service.Devices)
+	if err != nil {
+		return swarm.ServiceSpec{}, err
+	}
+
 	capAdd, capDrop := opts.EffectiveCapAddCapDrop(service.CapAdd, service.CapDrop)
 
 	serviceSpec := swarm.ServiceSpec{
@@ -153,6 +158,7 @@ func Service(
 				CapabilityAdd:   capAdd,
 				CapabilityDrop:  capDrop,
 				Ulimits:         convertUlimits(service.Ulimits),
+				Devices:         devices,
 			},
 			LogDriver:     logDriver,
 			Resources:     resources,
@@ -719,3 +725,30 @@ func convertUlimits(origUlimits map[string]*composetypes.UlimitsConfig) []*units
 	})
 	return ulimits
 }
+
+func convertDevices(devices []string) ([]container.DeviceMapping, error) {
+	newDevices := make([]container.DeviceMapping, len(devices))
+	for i, device := range devices {
+		parts := strings.Split(device, ":")
+		if len(parts) < 1 || len(parts) > 3 {
+			return nil, errors.New("failed to parse device")
+		}
+
+		mapping := container.DeviceMapping{
+			PathOnHost:      parts[0],
+			PathInContainer: parts[0],
+		}
+
+		if len(parts) > 1 {
+			mapping.PathInContainer = parts[1]
+		}
+
+		if len(parts) == 3 {
+			mapping.CgroupPermissions = parts[2]
+		}
+
+		newDevices[i] = mapping
+	}
+
+	return newDevices, nil
+}
diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go
@@ -11,7 +11,6 @@ var UnsupportedProperties = []string{
 	"build",
 	"cgroupns_mode",
 	"cgroup_parent",
-	"devices",
 	"domainname",
 	"external_links",
 	"ipc",