github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

Add support for runtime containerd namespace configuration

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2018-01-17 14:32:51 +00:00
parent 99fd71dc7f
commit 4b9ffadb2e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/init/cmd/service/prepare.go
View File

@ -23,6 +23,7 @@ type Runtime struct {
Mkdir []string `yaml:"mkdir" json:"mkdir,omitempty"` Mkdir []string `yaml:"mkdir" json:"mkdir,omitempty"`
Interfaces []Interface `yaml:"interfaces" json:"interfaces,omitempty"` Interfaces []Interface `yaml:"interfaces" json:"interfaces,omitempty"`
BindNS Namespaces `yaml:"bindNS" json:"bindNS,omitempty"` BindNS Namespaces `yaml:"bindNS" json:"bindNS,omitempty"`
Namespace string `yaml:"namespace,omitempty" json:"namespace,omitempty"`
} }
// Namespaces is the type for configuring paths to bind namespaces // Namespaces is the type for configuring paths to bind namespaces

5
pkg/init/cmd/service/start.go
View File

@ -11,6 +11,7 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/cio" "github.com/containerd/containerd/cio"
"github.com/containerd/containerd/namespaces"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
@ -113,6 +114,10 @@ func start(ctx context.Context, service, sock, basePath, dumpSpec string) (strin
} }
if runtimeConfig.Namespace != "" {
ctx = namespaces.WithNamespace(ctx, runtimeConfig.Namespace)
}
ctr, err := client.NewContainer(ctx, service, containerd.WithSpec(spec)) ctr, err := client.NewContainer(ctx, service, containerd.WithSpec(spec))
if err != nil { if err != nil {
return "", 0, "failed to create container", err return "", 0, "failed to create container", err