Remove protobuf for mount in shim
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
parent
ba61af665d
commit
ea00fc793b
@ -1,16 +1,22 @@
|
|||||||
package proc
|
package proc
|
||||||
|
|
||||||
import (
|
import (
|
||||||
containerd_types "github.com/containerd/containerd/api/types"
|
|
||||||
google_protobuf "github.com/gogo/protobuf/types"
|
google_protobuf "github.com/gogo/protobuf/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type Mount struct {
|
||||||
|
Type string
|
||||||
|
Source string
|
||||||
|
Target string
|
||||||
|
Options []string
|
||||||
|
}
|
||||||
|
|
||||||
// CreateConfig hold task creation configuration
|
// CreateConfig hold task creation configuration
|
||||||
type CreateConfig struct {
|
type CreateConfig struct {
|
||||||
ID string
|
ID string
|
||||||
Bundle string
|
Bundle string
|
||||||
Runtime string
|
Runtime string
|
||||||
Rootfs []*containerd_types.Mount
|
Rootfs []Mount
|
||||||
Terminal bool
|
Terminal bool
|
||||||
Stdin string
|
Stdin string
|
||||||
Stdout string
|
Stdout string
|
||||||
|
@ -95,6 +95,16 @@ type Service struct {
|
|||||||
func (s *Service) Create(ctx context.Context, r *shimapi.CreateTaskRequest) (*shimapi.CreateTaskResponse, error) {
|
func (s *Service) Create(ctx context.Context, r *shimapi.CreateTaskRequest) (*shimapi.CreateTaskResponse, error) {
|
||||||
s.mu.Lock()
|
s.mu.Lock()
|
||||||
defer s.mu.Unlock()
|
defer s.mu.Unlock()
|
||||||
|
|
||||||
|
var mounts []proc.Mount
|
||||||
|
for _, m := range r.Rootfs {
|
||||||
|
mounts = append(mounts, proc.Mount{
|
||||||
|
Type: m.Type,
|
||||||
|
Source: m.Source,
|
||||||
|
Target: m.Target,
|
||||||
|
Options: m.Options,
|
||||||
|
})
|
||||||
|
}
|
||||||
process, err := proc.New(
|
process, err := proc.New(
|
||||||
ctx,
|
ctx,
|
||||||
s.config.Path,
|
s.config.Path,
|
||||||
@ -108,7 +118,7 @@ func (s *Service) Create(ctx context.Context, r *shimapi.CreateTaskRequest) (*sh
|
|||||||
ID: r.ID,
|
ID: r.ID,
|
||||||
Bundle: r.Bundle,
|
Bundle: r.Bundle,
|
||||||
Runtime: r.Runtime,
|
Runtime: r.Runtime,
|
||||||
Rootfs: r.Rootfs,
|
Rootfs: mounts,
|
||||||
Terminal: r.Terminal,
|
Terminal: r.Terminal,
|
||||||
Stdin: r.Stdin,
|
Stdin: r.Stdin,
|
||||||
Stdout: r.Stdout,
|
Stdout: r.Stdout,
|
||||||
|
Loading…
Reference in New Issue
Block a user