github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1533 from justincormack/incremental-initrd

Browse Source 
Write the initrd incrementally
This commit is contained in:
Justin Cormack 2017-04-07 14:04:22 +01:00 committed by GitHub
commit 8d0bc4c3c6
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/cmd/moby/build.go
View File

@ -42,6 +42,13 @@ func build(args []string) {
buildInternal(*buildName, *buildPull, conf) buildInternal(*buildName, *buildPull, conf)
} }
func initrdAppend(iw *initrd.Writer, r io.Reader) {
_, err := initrd.Copy(iw, r)
if err != nil {
log.Fatalf("initrd write error: %v", err)
}
}
// Perform the actual build process // Perform the actual build process
func buildInternal(name string, pull bool, conf string) { func buildInternal(name string, pull bool, conf string) {
if name == "" { if name == "" {
@ -62,7 +69,8 @@ func buildInternal(name string, pull bool, conf string) {
log.Fatalf("Invalid config: %v", err) log.Fatalf("Invalid config: %v", err)
} }
containers := []*bytes.Buffer{} w := new(bytes.Buffer)
iw := initrd.NewWriter(w)
if pull { if pull {
log.Infof("Pull kernel image: %s", m.Kernel.Image) log.Infof("Pull kernel image: %s", m.Kernel.Image)
@ -87,7 +95,7 @@ func buildInternal(name string, pull bool, conf string) {
if err != nil { if err != nil {
log.Fatalf("Could not extract bzImage and kernel filesystem from tarball. %v", err) log.Fatalf("Could not extract bzImage and kernel filesystem from tarball. %v", err)
} }
containers = append(containers, ktar) initrdAppend(iw, ktar)
// convert init image to tarball // convert init image to tarball
if pull { if pull {
@ -103,7 +111,7 @@ func buildInternal(name string, pull bool, conf string) {
log.Fatalf("Failed to build init tarball: %v", err) log.Fatalf("Failed to build init tarball: %v", err)
} }
buffer := bytes.NewBuffer(init) buffer := bytes.NewBuffer(init)
containers = append(containers, buffer) initrdAppend(iw, buffer)
log.Infof("Add system containers:") log.Infof("Add system containers:")
for i, image := range m.System { for i, image := range m.System {
@ -126,7 +134,7 @@ func buildInternal(name string, pull bool, conf string) {
log.Fatalf("Failed to extract root filesystem for %s: %v", image.Image, err) log.Fatalf("Failed to extract root filesystem for %s: %v", image.Image, err)
} }
buffer := bytes.NewBuffer(out) buffer := bytes.NewBuffer(out)
containers = append(containers, buffer) initrdAppend(iw, buffer)
} }
log.Infof("Add daemon containers:") log.Infof("Add daemon containers:")
@ -149,7 +157,7 @@ func buildInternal(name string, pull bool, conf string) {
log.Fatalf("Failed to extract root filesystem for %s: %v", image.Image, err) log.Fatalf("Failed to extract root filesystem for %s: %v", image.Image, err)
} }
buffer := bytes.NewBuffer(out) buffer := bytes.NewBuffer(out)
containers = append(containers, buffer) initrdAppend(iw, buffer)
} }
// add files // add files
@ -157,16 +165,14 @@ func buildInternal(name string, pull bool, conf string) {
if err != nil { if err != nil {
log.Fatalf("failed to add filesystem parts: %v", err) log.Fatalf("failed to add filesystem parts: %v", err)
} }
containers = append(containers, buffer) initrdAppend(iw, buffer)
err = iw.Close()
log.Infof("Create initial ram disk")
initrd, err := containersInitrd(containers)
if err != nil { if err != nil {
log.Fatalf("Failed to make initrd %v", err) log.Fatalf("initrd close error: %v", err)
} }
log.Infof("Create outputs:") log.Infof("Create outputs:")
err = outputs(m, name, bzimage.Bytes(), initrd.Bytes()) err = outputs(m, name, bzimage.Bytes(), w.Bytes())
if err != nil { if err != nil {
log.Fatalf("Error writing outputs: %v", err) log.Fatalf("Error writing outputs: %v", err)
} }
@ -209,17 +215,3 @@ func untarKernel(buf *bytes.Buffer, bzimageName, ktarName string) (*bytes.Buffer
return bzimage, ktar, nil return bzimage, ktar, nil
} }
func containersInitrd(containers []*bytes.Buffer) (*bytes.Buffer, error) {
w := new(bytes.Buffer)
iw := initrd.NewWriter(w)
defer iw.Close()
for _, file := range containers {
_, err := initrd.Copy(iw, file)
if err != nil {
return nil, err
}
}
return w, nil
}