rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-13 20:36:36 +00:00
Code Issues Releases Wiki Activity

Support URL when using ros install -c (#2202)

Browse Source
This commit is contained in:
niusmallnan 2018-01-02 17:17:43 +08:00 committed by GitHub
parent b08d29cc2c
commit 3b92e04065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/control/install.go
View File

@ -158,8 +158,14 @@ func installAction(c *cli.Context) error {
} else { } else {
os.MkdirAll("/opt", 0755) os.MkdirAll("/opt", 0755)
uc := "/opt/user_config.yml" uc := "/opt/user_config.yml"
if err := util.FileCopy(cloudConfig, uc); err != nil { if strings.HasPrefix(cloudConfig, "http://") || strings.HasPrefix(cloudConfig, "https://") {
log.WithFields(log.Fields{"cloudConfig": cloudConfig, "error": err}).Fatal("Failed to copy cloud-config") if err := util.HTTPDownloadToFile(cloudConfig, uc); err != nil {
log.WithFields(log.Fields{"cloudConfig": cloudConfig, "error": err}).Fatal("Failed to http get cloud-config")
}
} else {
if err := util.FileCopy(cloudConfig, uc); err != nil {
log.WithFields(log.Fields{"cloudConfig": cloudConfig, "error": err}).Fatal("Failed to copy cloud-config")
}
} }
cloudConfig = uc cloudConfig = uc
} }

14
util/util.go
View File

@ -6,6 +6,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/http"
"os" "os"
"os/exec" "os/exec"
"path" "path"
@ -45,6 +46,19 @@ func FileCopy(src, dest string) error {
return WriteFileAtomic(dest, data, 0666) return WriteFileAtomic(dest, data, 0666)
} }
func HTTPDownloadToFile(url, dest string) error {
res, err := http.Get(url)
if err != nil {
return err
}
defer res.Body.Close()
body, err := ioutil.ReadAll(res.Body)
if err != nil {
return err
}
return WriteFileAtomic(dest, body, 0666)
}
func WriteFileAtomic(filename string, data []byte, perm os.FileMode) error { func WriteFileAtomic(filename string, data []byte, perm os.FileMode) error {
dir, file := path.Split(filename) dir, file := path.Split(filename)
tempFile, err := ioutil.TempFile(dir, fmt.Sprintf(".%s", file)) tempFile, err := ioutil.TempFile(dir, fmt.Sprintf(".%s", file))