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

Fix golint errors

Browse Source
This commit is contained in:
Josh Curl
2016-11-28 00:06:00 -08:00
parent fa1dc760f2
commit a7c34b9855
35 changed files with 205 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/control/user_docker.go
View File

@@ -23,15 +23,15 @@ import (
)
const (
DEFAULT_STORAGE_CONTEXT = "console"
DOCKER_PID_FILE = "/var/run/docker.pid"
userDocker = "user-docker"
sourceDirectory = "/engine"
destDirectory = "/var/lib/rancher/engine"
defaultStorageContext = "console"
dockerPidFile = "/var/run/docker.pid"
userDocker = "user-docker"
sourceDirectory = "/engine"
destDirectory = "/var/lib/rancher/engine"
)
var (
DOCKER_COMMAND = []string{
dockerCommand = []string{
"ros",
"docker-init",
}
@@ -105,7 +105,7 @@ func copyBinaries(source, dest string) error {
}
func writeConfigCerts(cfg *config.CloudConfig) error {
outDir := ServerTlsPath
outDir := ServerTLSPath
if err := os.MkdirAll(outDir, 0700); err != nil {
return err
}
@@ -137,7 +137,7 @@ func writeConfigCerts(cfg *config.CloudConfig) error {
func startDocker(cfg *config.CloudConfig) error {
storageContext := cfg.Rancher.Docker.StorageContext
if storageContext == "" {
storageContext = DEFAULT_STORAGE_CONTEXT
storageContext = defaultStorageContext
}
log.Infof("Starting Docker in context: %s", storageContext)
@@ -179,7 +179,7 @@ func startDocker(cfg *config.CloudConfig) error {
cmd := []string{"docker-runc", "exec", "--", info.ID, "env"}
log.Info(dockerCfg.AppendEnv())
cmd = append(cmd, dockerCfg.AppendEnv()...)
cmd = append(cmd, DOCKER_COMMAND...)
cmd = append(cmd, dockerCommand...)
cmd = append(cmd, args...)
log.Infof("Running %v", cmd)
@@ -214,7 +214,7 @@ func getPid(service string, project *project.Project) (int, error) {
}
client, err := composeClient.Create(composeClient.Options{
Host: config.DOCKER_SYSTEM_HOST,
Host: config.SystemDockerHost,
})
if err != nil {
return 0, err