burble/nomad-driver-containerd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for mounts.

Browse Source 
Signed-off-by: Shishir Mahajan <smahajan@roblox.com>
This commit is contained in:
Shishir Mahajan 2020-06-26 18:25:05 -07:00
parent f3896d5ec2
commit acf30037b2
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
containerd/containerd.go
View File

@ -25,11 +25,13 @@ func (d *Driver) createContainer(image containerd.Image, containerName, containe
return nil, fmt.Errorf("Command is empty. Cannot set --args without --command.") return nil, fmt.Errorf("Command is empty. Cannot set --args without --command.")
} }
// Command set by the user, to override entrypoint or cmd defined in the image.
var args []string var args []string
if config.Command != "" { if config.Command != "" {
args = append(args, config.Command) args = append(args, config.Command)
} }
// Arguments to the command set by the user.
if len(config.Args) > 0 { if len(config.Args) > 0 {
args = append(args, config.Args...) args = append(args, config.Args...)
} }
@ -38,22 +40,27 @@ func (d *Driver) createContainer(image containerd.Image, containerName, containe
opts = append(opts, oci.WithImageConfigArgs(image, args)) opts = append(opts, oci.WithImageConfigArgs(image, args))
// Enable privileged mode.
if config.Privileged { if config.Privileged {
opts = append(opts, oci.WithPrivileged) opts = append(opts, oci.WithPrivileged)
} }
// Launch container in read-only mode.
if config.ReadOnlyRootfs { if config.ReadOnlyRootfs {
opts = append(opts, oci.WithRootFSReadonly()) opts = append(opts, oci.WithRootFSReadonly())
} }
// Add capabilities.
if len(config.CapAdd) > 0 { if len(config.CapAdd) > 0 {
opts = append(opts, oci.WithAddedCapabilities(config.CapAdd)) opts = append(opts, oci.WithAddedCapabilities(config.CapAdd))
} }
// Drop capabilities.
if len(config.CapDrop) > 0 { if len(config.CapDrop) > 0 {
opts = append(opts, oci.WithDroppedCapabilities(config.CapDrop)) opts = append(opts, oci.WithDroppedCapabilities(config.CapDrop))
} }
// Set environment variables.
opts = append(opts, oci.WithEnv(env)) opts = append(opts, oci.WithEnv(env))
// Add linux devices into the container. // Add linux devices into the container.

19
containerd/driver.go
View File

@ -77,6 +77,15 @@ var (
"devices": hclspec.NewAttr("devices", "list(string)", false), "devices": hclspec.NewAttr("devices", "list(string)", false),
"privileged": hclspec.NewAttr("privileged", "bool", false), "privileged": hclspec.NewAttr("privileged", "bool", false),
"readonly_rootfs": hclspec.NewAttr("readonly_rootfs", "bool", false), "readonly_rootfs": hclspec.NewAttr("readonly_rootfs", "bool", false),
"mounts": hclspec.NewBlockList("mounts", hclspec.NewObject(map[string]*hclspec.Spec{
"type": hclspec.NewDefault(
hclspec.NewAttr("type", "string", false),
hclspec.NewLiteral("\"volume\""),
),
"target": hclspec.NewAttr("target", "string", false),
"source": hclspec.NewAttr("source", "string", false),
"options": hclspec.NewAttr("options", "list(string)", false),
})),
}) })
// capabilities indicates what optional features this driver supports // capabilities indicates what optional features this driver supports
@ -96,6 +105,15 @@ type Config struct {
StatsInterval string `codec:"stats_interval"` StatsInterval string `codec:"stats_interval"`
} }
// Volume, bind, and tmpfs type mounts are supported.
// Mount contains configuration information about a mountpoint.
type Mount struct {
Type string `codec:"type"`
Target string `codec:"target"`
Source string `codec:"source"`
Options []string `codec:"options"`
}
// TaskConfig contains configuration information for a task that runs with // TaskConfig contains configuration information for a task that runs with
// this plugin // this plugin
type TaskConfig struct { type TaskConfig struct {
@ -107,6 +125,7 @@ type TaskConfig struct {
Devices []string `codec:"devices"` Devices []string `codec:"devices"`
Privileged bool `codec:"privileged"` Privileged bool `codec:"privileged"`
ReadOnlyRootfs bool `codec:"readonly_rootfs"` ReadOnlyRootfs bool `codec:"readonly_rootfs"`
Mounts []Mount `codec:"mounts"`
} }
// TaskState is the runtime state which is encoded in the handle returned to // TaskState is the runtime state which is encoded in the handle returned to