github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 01:29:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48 from justincormack/dir-fixes

Browse Source 
Fix build in directory
This commit is contained in:
Justin Cormack 2017-05-26 15:28:18 +01:00 committed by GitHub
commit e8dc61e910
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/moby/build.go
View File

@ -99,10 +99,10 @@ func build(args []string) {
log.Fatalf("Invalid config: %v", err) log.Fatalf("Invalid config: %v", err)
} }
image := buildInternal(m, filepath.Join(*buildDir, name), *buildPull) image := buildInternal(m, *buildPull)
log.Infof("Create outputs:") log.Infof("Create outputs:")
err = outputs(name, image, buildOut) err = outputs(filepath.Join(*buildDir, name), image, buildOut)
if err != nil { if err != nil {
log.Fatalf("Error writing outputs: %v", err) log.Fatalf("Error writing outputs: %v", err)
} }
@ -156,7 +156,7 @@ func enforceContentTrust(fullImageName string, config *TrustConfig) bool {
// Perform the actual build process // Perform the actual build process
// TODO return error not panic // TODO return error not panic
func buildInternal(m Moby, name string, pull bool) []byte { func buildInternal(m Moby, pull bool) []byte {
w := new(bytes.Buffer) w := new(bytes.Buffer)
iw := tar.NewWriter(w) iw := tar.NewWriter(w)