@@ -3,73 +3,25 @@ package daemon
33import (
44 "context"
55 "io"
6- "io/ioutil"
76 "os"
87 "sync"
98
109 "github.com/docker/docker/api/types"
11- "github.com/docker/docker/client"
12- "github.com/google/go-containerregistry/pkg/name"
1310 "github.com/google/go-containerregistry/pkg/v1"
1411 "github.com/google/go-containerregistry/pkg/v1/tarball"
1512 "golang.org/x/xerrors"
1613)
1714
1815var mu sync.Mutex
1916
20- // image is a wrapper for github.com/google/go-containerregistry/pkg/v1/daemon.Image
21- // daemon.Image loads the entire image into the memory at first,
22- // but it doesn't need to load it if the information is already in the cache,
23- // To avoid entire loading, this wrapper uses ImageInspectWithRaw and checks image ID and layer IDs.
24- type image struct {
25- v1.Image
26- opener opener
27- inspect types.ImageInspect
28- }
29-
3017type opener func () (v1.Image , error )
3118
32- // Image implements v1.Image by extending daemon.Image.
33- // The caller must call cleanup() to remove a temporary file.
34- func Image (ref name.Reference ) (v1.Image , * types.ImageInspect , func (), error ) {
35- cleanup := func () {}
19+ type imageSave func (context.Context , []string ) (io.ReadCloser , error )
3620
37- c , err := client .NewClientWithOpts (client .FromEnv , client .WithAPIVersionNegotiation ())
38- if err != nil {
39- return nil , nil , cleanup , xerrors .Errorf ("failed to initialize a docker client: %w" , err )
40- }
41- defer func () {
42- if err != nil {
43- c .Close ()
44- }
45- }()
46-
47- inspect , _ , err := c .ImageInspectWithRaw (context .Background (), ref .Name ())
48- if err != nil {
49- return nil , nil , cleanup , xerrors .Errorf ("unable to inspect the image (%s): %w" , ref .Name (), err )
50- }
51-
52- f , err := ioutil .TempFile ("" , "fanal-*" )
53- if err != nil {
54- return nil , nil , cleanup , xerrors .Errorf ("failed to create a temporary file" )
55- }
56-
57- cleanup = func () {
58- c .Close ()
59- f .Close ()
60- _ = os .Remove (f .Name ())
61- }
62-
63- return & image {
64- opener : imageOpener (c , ref , f ),
65- inspect : inspect ,
66- }, & inspect , cleanup , nil
67- }
68-
69- func imageOpener (c * client.Client , ref name.Reference , f * os.File ) opener {
21+ func imageOpener (ref string , f * os.File , imageSave imageSave ) opener {
7022 return func () (v1.Image , error ) {
7123 // Store the tarball in local filesystem and return a new reader into the bytes each time we need to access something.
72- rc , err := c . ImageSave (context .Background (), []string {ref . Name () })
24+ rc , err := imageSave (context .Background (), []string {ref })
7325 if err != nil {
7426 return nil , xerrors .Errorf ("unable to export the image: %w" , err )
7527 }
@@ -89,6 +41,16 @@ func imageOpener(c *client.Client, ref name.Reference, f *os.File) opener {
8941 }
9042}
9143
44+ // image is a wrapper for github.com/google/go-containerregistry/pkg/v1/daemon.Image
45+ // daemon.Image loads the entire image into the memory at first,
46+ // but it doesn't need to load it if the information is already in the cache,
47+ // To avoid entire loading, this wrapper uses ImageInspectWithRaw and checks image ID and layer IDs.
48+ type image struct {
49+ v1.Image
50+ opener opener
51+ inspect types.ImageInspect
52+ }
53+
9254// populateImage initializes an "image" struct.
9355// This method is called by some goroutines at the same time.
9456// To prevent multiple heavy initializations, the lock is necessary.
@@ -114,6 +76,13 @@ func (img *image) ConfigName() (v1.Hash, error) {
11476}
11577
11678func (img * image ) ConfigFile () (* v1.ConfigFile , error ) {
79+ if len (img .inspect .RootFS .Layers ) == 0 {
80+ // Podman doesn't return RootFS...
81+ if err := img .populateImage (); err != nil {
82+ return nil , xerrors .Errorf ("unable to populate: %w" , err )
83+ }
84+ return img .Image .ConfigFile ()
85+ }
11786 var diffIDs []v1.Hash
11887 for _ , l := range img .inspect .RootFS .Layers {
11988 h , err := v1 .NewHash (l )
0 commit comments