rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 22:32:14 +00:00
Code Issues Releases Wiki Activity

Build docker-sys bridge via system-docker args and remove cni-glue

Browse Source
This commit is contained in:
niusmallnan
2018-04-16 14:16:08 +08:00
parent da8d5ed027
commit ba388b6bc6
10 changed files with 31 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main.go
View File

@@ -4,11 +4,8 @@ import (
"fmt"
"os"
"github.com/containernetworking/cni/plugins/ipam/host-local"
"github.com/containernetworking/cni/plugins/main/bridge"
"github.com/docker/docker/docker"
"github.com/docker/docker/pkg/reexec"
"github.com/rancher/cniglue"
"github.com/rancher/os/cmd/cloudinitexecute"
"github.com/rancher/os/cmd/cloudinitsave"
"github.com/rancher/os/cmd/control"
@@ -35,9 +32,6 @@ var entrypoints = map[string]func(){
"ros-bootstrap": control.BootstrapMain,
"ros-sysinit": sysinit.Main,
"wait-for-docker": wait.Main,
"cni-glue": glue.Main,
"bridge": bridge.Main,
"host-local": hostlocal.Main,
"respawn": respawn.Main,
// Power commands