kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove job image_tarlayer

Browse source 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
This commit is contained in:
Antonio Murdaca 2015-04-21 19:59:45 +02:00
parent afd5636461
commit ba0017595e
2 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
graph/export.go
View file

@ -139,9 +139,7 @@ func (s *TagStore) exportImage(eng *engine.Engine, name, tempdir string) error {
if err != nil { if err != nil {
return err return err
} }
job = eng.Job("image_tarlayer", n) if err := s.ImageTarLayer(n, fsTar); err != nil {
job.Stdout.Add(fsTar)
if err := job.Run(); err != nil {
return err return err
} }

25
graph/service.go
View file

@ -11,14 +11,13 @@ import (
func (s *TagStore) Install(eng *engine.Engine) error { func (s *TagStore) Install(eng *engine.Engine) error {
for name, handler := range map[string]engine.Handler{ for name, handler := range map[string]engine.Handler{
"image_set": s.CmdSet, "image_set": s.CmdSet,
"image_get": s.CmdGet, "image_get": s.CmdGet,
"image_inspect": s.CmdLookup, "image_inspect": s.CmdLookup,
"image_tarlayer": s.CmdTarLayer, "image_export": s.CmdImageExport,
"image_export": s.CmdImageExport, "viz": s.CmdViz,
"viz": s.CmdViz, "load": s.CmdLoad,
"load": s.CmdLoad, "push": s.CmdPush,
"push": s.CmdPush,
} { } {
if err := eng.Register(name, handler); err != nil { if err := eng.Register(name, handler); err != nil {
return fmt.Errorf("Could not register %q: %v", name, err) return fmt.Errorf("Could not register %q: %v", name, err)
@ -152,12 +151,8 @@ func (s *TagStore) CmdLookup(job *engine.Job) error {
return fmt.Errorf("No such image: %s", name) return fmt.Errorf("No such image: %s", name)
} }
// CmdTarLayer return the tarLayer of the image // ImageTarLayer return the tarLayer of the image
func (s *TagStore) CmdTarLayer(job *engine.Job) error { func (s *TagStore) ImageTarLayer(name string, dest io.Writer) error {
if len(job.Args) != 1 {
return fmt.Errorf("usage: %s NAME", job.Name)
}
name := job.Args[0]
if image, err := s.LookupImage(name); err == nil && image != nil { if image, err := s.LookupImage(name); err == nil && image != nil {
fs, err := image.TarLayer() fs, err := image.TarLayer()
if err != nil { if err != nil {
@ -165,7 +160,7 @@ func (s *TagStore) CmdTarLayer(job *engine.Job) error {
} }
defer fs.Close() defer fs.Close()
written, err := io.Copy(job.Stdout, fs) written, err := io.Copy(dest, fs)
if err != nil { if err != nil {
return err return err
} }