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

Merge pull request #6 from AkihiroSuda/stdin

Browse Source 
build: support reading yaml from stdin
This commit is contained in:
Justin Cormack 2017-04-27 14:12:34 +01:00 committed by GitHub
commit 7517c830d7
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
cmd/moby/build.go
View File

@ -16,11 +16,13 @@ import (
"github.com/linuxkit/linuxkit/src/initrd"
)
const defaultNameForStdin = "moby"
// Process the build arguments and execute build
func build(args []string) {
buildCmd := flag.NewFlagSet("build", flag.ExitOnError)
buildCmd.Usage = func() {
fmt.Printf("USAGE: %s build [options] <file>[.yml]\n\n", os.Args[0])
fmt.Printf("USAGE: %s build [options] <file>[.yml] | -\n\n", os.Args[0])
fmt.Printf("Options:\n")
buildCmd.PrintDefaults()
}
@ -37,12 +39,32 @@ func build(args []string) {
buildCmd.Usage()
os.Exit(1)
}
conf := remArgs[0]
if !(filepath.Ext(conf) == ".yml" || filepath.Ext(conf) == ".yaml") {
conf = conf + ".yml"
name := *buildName
var config []byte
if conf := remArgs[0]; conf == "-" {
var err error
config, err = ioutil.ReadAll(os.Stdin)
if err != nil {
log.Fatalf("Cannot read stdin: %v", err)
}
if name == "" {
name = defaultNameForStdin
}
} else {
if !(filepath.Ext(conf) == ".yml" || filepath.Ext(conf) == ".yaml") {
conf = conf + ".yml"
}
var err error
config, err = ioutil.ReadFile(conf)
if err != nil {
log.Fatalf("Cannot open config file: %v", err)
}
if name == "" {
name = strings.TrimSuffix(filepath.Base(conf), filepath.Ext(conf))
}
}
buildInternal(*buildName, *buildPull, conf)
buildInternal(name, *buildPull, config)
}
func initrdAppend(iw *initrd.Writer, r io.Reader) {
@ -78,20 +100,7 @@ func enforceContentTrust(fullImageName string, config *TrustConfig) bool {
}
// Perform the actual build process
func buildInternal(name string, pull bool, conf string) {
if name == "" {
name = filepath.Base(conf)
ext := filepath.Ext(conf)
if ext != "" {
name = name[:len(name)-len(ext)]
}
}
config, err := ioutil.ReadFile(conf)
if err != nil {
log.Fatalf("Cannot open config file: %v", err)
}
func buildInternal(name string, pull bool, config []byte) {
m, err := NewConfig(config)
if err != nil {
log.Fatalf("Invalid config: %v", err)