djpbessems/Tinkerbell.Sandbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unpack all image and not just the last layer (#27)

Browse Source 
The go program we use to get binaries from a docker image was unpacking
only the last layer. This is not required and in order to have a more
generic approach and fewest requirement the program now unpack all the
image
This commit is contained in:
mergify[bot] 2020-11-24 16:29:08 +00:00 committed by GitHub
commit 2db68f09b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/getbinariesfromquay/main.go
View File

@ -98,14 +98,14 @@ func main() {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
err = copyBinaryFromLastLayer(path.Join(imgsDir, imgDir), path.Join(releaseDir, imgDir), binaryToCopy) err = untarLayers(path.Join(imgsDir, imgDir), path.Join(releaseDir, imgDir), binaryToCopy)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }
} }
func copyBinaryFromLastLayer(src, dest, binaryPath string) error { func untarLayers(src, dest, binaryPath string) error {
b, err := ioutil.ReadFile(path.Join(src, "manifest.json")) b, err := ioutil.ReadFile(path.Join(src, "manifest.json"))
if err != nil { if err != nil {
return err return err
@ -114,14 +114,15 @@ func copyBinaryFromLastLayer(src, dest, binaryPath string) error {
if err != nil { if err != nil {
return err return err
} }
last := man.LayerInfos()[len(man.LayerInfos())-1] for _, l := range man.LayerInfos() {
layerTar, err := os.Open(path.Join(src, last.Digest.String()[7:])) layerTar, err := os.Open(path.Join(src, l.Digest.String()[7:]))
if err != nil { if err != nil {
return err return err
} }
err = tar.Untar(src, layerTar) err = tar.Untar(src, layerTar)
if err != nil { if err != nil {
return err return err
}
} }
input, err := ioutil.ReadFile(path.Join(src, binaryPath)) input, err := ioutil.ReadFile(path.Join(src, binaryPath))