rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-03 07:44:21 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1332 from joshwget/move-in-netconf-and-dfs

Browse Source 
Move in code from netconf and docker-from-scratch
This commit is contained in:
Josh Curl
2016-10-19 17:56:30 -07:00
committed by GitHub
parent 404e21f937 691f7cb42c
commit 5ecbf19aa8
34 changed files with 131 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
init/bootstrap.go
View File

@@ -4,9 +4,9 @@ import (
"syscall"
log "github.com/Sirupsen/logrus"
"github.com/rancher/docker-from-scratch"
"github.com/rancher/os/compose"
"github.com/rancher/os/config"
"github.com/rancher/os/dfs"
"github.com/rancher/os/util"
)
@@ -25,7 +25,7 @@ func startDocker(cfg *config.CloudConfig) (chan interface{}, error) {
launchConfig.LogFile = ""
launchConfig.NoLog = true
cmd, err := dockerlaunch.LaunchDocker(launchConfig, config.SYSTEM_DOCKER_BIN, args...)
cmd, err := dfs.LaunchDocker(launchConfig, config.SYSTEM_DOCKER_BIN, args...)
if err != nil {
return nil, err
}