From 7eaa59f626fa9e9b3bf61d3d7eff0fb70b3d011a Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Mon, 2 Sep 2013 09:06:17 -0700 Subject: [PATCH 1/9] Offline Image Transfers #1155 --- api.go | 19 ++++ commands.go | 38 ++++++++ docs/sources/commandline/cli.rst | 22 +++++ server.go | 149 +++++++++++++++++++++++++++++++ 4 files changed, 228 insertions(+) diff --git a/api.go b/api.go index 93322fd8a..cf46ee316 100644 --- a/api.go +++ b/api.go @@ -534,6 +534,23 @@ func postImagesPush(srv *Server, version float64, w http.ResponseWriter, r *http return nil } +func getImagesGet(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error { + name := vars["name"] + err := srv.ImageExport(name, w) + if err != nil { + return err + } + return nil +} + +func postImagesLoad(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error { + err := srv.ImageLoad(r.Body) + if err != nil { + return err + } + return nil +} + func postContainersCreate(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error { if err := parseForm(r); err != nil { return nil @@ -1036,6 +1053,7 @@ func createRouter(srv *Server, logging bool) (*mux.Router, error) { "/images/json": getImagesJSON, "/images/viz": getImagesViz, "/images/search": getImagesSearch, + "/images/{name:.*}/get": getImagesGet, "/images/{name:.*}/history": getImagesHistory, "/images/{name:.*}/json": getImagesByName, "/containers/ps": getContainersJSON, @@ -1052,6 +1070,7 @@ func createRouter(srv *Server, logging bool) (*mux.Router, error) { "/build": postBuild, "/images/create": postImagesCreate, "/images/{name:.*}/insert": postImagesInsert, + "/images/load": postImagesLoad, "/images/{name:.*}/push": postImagesPush, "/images/{name:.*}/tag": postImagesTag, "/containers/create": postContainersCreate, diff --git a/commands.go b/commands.go index 889aa72ff..736334e40 100644 --- a/commands.go +++ b/commands.go @@ -92,6 +92,7 @@ func (cli *DockerCli) CmdHelp(args ...string) error { {"insert", "Insert a file in an image"}, {"inspect", "Return low-level information on a container"}, {"kill", "Kill a running container"}, + {"load", "Load an image from a tar archive"}, {"login", "Register or Login to the docker registry server"}, {"logs", "Fetch the logs of a container"}, {"port", "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"}, @@ -102,6 +103,7 @@ func (cli *DockerCli) CmdHelp(args ...string) error { {"rm", "Remove one or more containers"}, {"rmi", "Remove one or more images"}, {"run", "Run a command in a new container"}, + {"save", "Save an image to a tar archive"}, {"search", "Search for an image in the docker index"}, {"start", "Start a stopped container"}, {"stop", "Stop a running container"}, @@ -1961,6 +1963,42 @@ func (cli *DockerCli) CmdCp(args ...string) error { return nil } +func (cli *DockerCli) CmdSave(args ...string) error { + cmd := Subcmd("save", "IMAGE DESTINATION", "Save an image to a tar archive") + if err := cmd.Parse(args); err != nil { + cmd.Usage() + return nil + } + + if cmd.NArg() != 1 { + cmd.Usage() + return nil + } + + image := cmd.Arg(0) + + if err := cli.stream("GET", "/images/"+image+"/get", nil, cli.out, nil); err != nil { + return err + } + return nil +} + +func (cli *DockerCli) CmdLoad(args ...string) error { + cmd := Subcmd("load", "SOURCE", "Load an image from a tar archive") + + if cmd.NArg() != 0 { + cmd.Usage() + return nil + } + + err := cli.stream("POST", "/images/load", cli.in, cli.out, nil) + if err != nil { + fmt.Println("Send failed", err) + } + + return nil +} + func (cli *DockerCli) call(method, path string, data interface{}) ([]byte, int, error) { var params io.Reader if data != nil { diff --git a/docs/sources/commandline/cli.rst b/docs/sources/commandline/cli.rst index d0a8d83c0..2adfe48f9 100644 --- a/docs/sources/commandline/cli.rst +++ b/docs/sources/commandline/cli.rst @@ -559,6 +559,17 @@ Known Issues (kill) * :issue:`197` indicates that ``docker kill`` may leave directories behind and make it difficult to remove the container. +.. _cli_load: + +``load`` +-------- + +:: + Usage: docker load < repository.tar + + Loads a tarred repository from the standard input stream. + Restores both images and tags. + .. _cli_login: ``login`` @@ -852,6 +863,17 @@ Known Issues (run -volumes-from) could indicate a permissions problem with AppArmor. Please see the issue for a workaround. +.. _cli_save: + +``save`` + +:: + + Usage: docker save image > repository.tar + + Streams a tarred repository to the standard output stream. + Contains all parent layers, and all tags + versions. + .. _cli_search: ``search`` diff --git a/server.go b/server.go index e9a76f8d8..ac6401b2d 100644 --- a/server.go +++ b/server.go @@ -197,6 +197,155 @@ func (srv *Server) ContainerExport(name string, out io.Writer) error { return fmt.Errorf("No such container: %s", name) } +// ImageExport exports all images with the given tag. All versions +// containing the same tag are exported. The resulting output is an +// uncompressed tar ball. +// name is the set of tags to export. +// out is the writer where the images are written to. +func (srv *Server) ImageExport(name string, out io.Writer) error { + // get image json + tempdir, err := ioutil.TempDir("", "docker-export-") + if err != nil { + utils.Debugf("save", name, "") + return err + } + utils.Debugf("Serializing %s", name) + + rootRepo := srv.runtime.repositories.Repositories[name] + for _, rootImage := range rootRepo { + image, _ := srv.ImageInspect(rootImage) + for i := image; i != nil; { + // temporary directory + tmpImageDir := path.Join(tempdir, i.ID) + os.Mkdir(tmpImageDir, os.ModeDir) + + // serialize json + b, err := json.Marshal(i) + if err != nil { + utils.Debugf("%s", err) + os.RemoveAll(tempdir) + return err + } + ioutil.WriteFile(path.Join(tmpImageDir, "json"), b, os.ModeAppend) + + // serialize filesystem + fs, err := Tar(path.Join(srv.runtime.graph.Root, i.ID, "layer"), Uncompressed) + if err != nil { + utils.Debugf("%s", err) + os.RemoveAll(tempdir) + return err + } + fsTar, err := os.Create(path.Join(tmpImageDir, "layer.tar")) + if err != nil { + os.RemoveAll(tempdir) + utils.Debugf("%s", err) + return err + } + _, err = io.Copy(fsTar, fs) + if err != nil { + utils.Debugf("%s", err) + os.RemoveAll(tempdir) + return err + } + fsTar.Close() + + // find parent + if i.Parent != "" { + i, err = srv.ImageInspect(i.Parent) + if err != nil { + utils.Debugf("%s", err) + os.RemoveAll(tempdir) + return err + } + } else { + i = nil + } + } + } + + // write repositories + rootRepoMap := map[string]Repository{} + rootRepoMap[name] = rootRepo + rootRepoJson, _ := json.Marshal(rootRepoMap) + + ioutil.WriteFile(path.Join(tempdir, "repositories"), rootRepoJson, os.ModeAppend) + + fs, err := Tar(tempdir, Uncompressed) + if err != nil { + os.RemoveAll(tempdir) + return err + } + if _, err := io.Copy(out, fs); err != nil { + os.RemoveAll(tempdir) + return err + } + os.RemoveAll(tempdir) + return nil +} + +// Loads a set of images into the repository. This is the complementary of ImageExport. +// The input stream is an uncompressed tar ball containing images and metadata. +func (srv *Server) ImageLoad(in io.Reader) error { + tmpImageDir, _ := ioutil.TempDir("", "docker-import-") + repoTarFile := path.Join(tmpImageDir, "repo.tar") + repoDir := path.Join(tmpImageDir, "repo") + tarFile, _ := os.Create(repoTarFile) + io.Copy(tarFile, in) + tarFile.Close() + repoFile, _ := os.Open(repoTarFile) + os.Mkdir(repoDir, os.ModeDir) + Untar(repoFile, repoDir) + repositoriesJson, _ := ioutil.ReadFile(path.Join(tmpImageDir, "repo", "repositories")) + repositories := map[string]Repository{} + json.Unmarshal(repositoriesJson, &repositories) + + for imageName, tagMap := range repositories { + for tag, address := range tagMap { + err := srv.recursiveLoad(address, tmpImageDir) + if err != nil { + utils.Debugf("Error loading repository") + } + srv.runtime.repositories.Set(imageName, tag, address, true) + } + } + os.RemoveAll(tmpImageDir) + return nil +} + +func (srv *Server) recursiveLoad(address, tmpImageDir string) error { + _, err := srv.ImageInspect(address) + utils.Debugf("Attempting to load %s", "address") + if err != nil { + utils.Debugf("Loading %s", address) + imageJson, err := ioutil.ReadFile(path.Join(tmpImageDir, "repo", address, "json")) + if err != nil { + return err + utils.Debugf("Error reading json", err) + } + layer, err := os.Open(path.Join(tmpImageDir, "repo", address, "layer.tar")) + if err != nil { + utils.Debugf("Error reading embedded tar", err) + return err + } + img, err := NewImgJSON(imageJson) + if err != nil { + utils.Debugf("Error unmarshalling json", err) + return err + } + if img.Parent != "" { + if !srv.runtime.graph.Exists(img.Parent) { + srv.recursiveLoad(img.Parent, tmpImageDir) + } + } + err = srv.runtime.graph.Register(imageJson, layer, img) + if err != nil { + utils.Debugf("Error registering image") + } + } + utils.Debugf("Completed processing %s", address) + return nil +} + func (srv *Server) ImagesSearch(term string) ([]registry.SearchResult, error) { r, err := registry.NewRegistry(srv.runtime.config.Root, nil, srv.HTTPRequestFactory(nil)) if err != nil { From 61a8020e51ac6de9bc777098a04e05a185c2cd32 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Fri, 11 Oct 2013 22:11:49 -0700 Subject: [PATCH 2/9] Adding version info, switching to defer for cleanup --- server.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/server.go b/server.go index ac6401b2d..564ae7c0f 100644 --- a/server.go +++ b/server.go @@ -218,12 +218,15 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { // temporary directory tmpImageDir := path.Join(tempdir, i.ID) os.Mkdir(tmpImageDir, os.ModeDir) + defer os.RemoveAll(tempdir) + var version = "0.7" + var versionBuf = []byte(version) + ioutil.WriteFile(path.Join(tmpImageDir, "VERSION"), versionBuf, os.ModeAppend) // serialize json b, err := json.Marshal(i) if err != nil { utils.Debugf("%s", err) - os.RemoveAll(tempdir) return err } ioutil.WriteFile(path.Join(tmpImageDir, "json"), b, os.ModeAppend) @@ -232,19 +235,16 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { fs, err := Tar(path.Join(srv.runtime.graph.Root, i.ID, "layer"), Uncompressed) if err != nil { utils.Debugf("%s", err) - os.RemoveAll(tempdir) return err } fsTar, err := os.Create(path.Join(tmpImageDir, "layer.tar")) if err != nil { - os.RemoveAll(tempdir) utils.Debugf("%s", err) return err } _, err = io.Copy(fsTar, fs) if err != nil { utils.Debugf("%s", err) - os.RemoveAll(tempdir) return err } fsTar.Close() @@ -254,7 +254,6 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { i, err = srv.ImageInspect(i.Parent) if err != nil { utils.Debugf("%s", err) - os.RemoveAll(tempdir) return err } } else { @@ -271,15 +270,13 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { ioutil.WriteFile(path.Join(tempdir, "repositories"), rootRepoJson, os.ModeAppend) fs, err := Tar(tempdir, Uncompressed) + defer os.RemoveAll(tempdir) if err != nil { - os.RemoveAll(tempdir) return err } if _, err := io.Copy(out, fs); err != nil { - os.RemoveAll(tempdir) return err } - os.RemoveAll(tempdir) return nil } @@ -287,6 +284,7 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { // The input stream is an uncompressed tar ball containing images and metadata. func (srv *Server) ImageLoad(in io.Reader) error { tmpImageDir, _ := ioutil.TempDir("", "docker-import-") + defer os.RemoveAll(tmpImageDir) repoTarFile := path.Join(tmpImageDir, "repo.tar") repoDir := path.Join(tmpImageDir, "repo") tarFile, _ := os.Create(repoTarFile) @@ -308,7 +306,6 @@ func (srv *Server) ImageLoad(in io.Reader) error { srv.runtime.repositories.Set(imageName, tag, address, true) } } - os.RemoveAll(tmpImageDir) return nil } From bf504f2afab679922e92b8bb5fe28957f5f6bf02 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Sat, 2 Nov 2013 01:18:55 -0700 Subject: [PATCH 3/9] Adding spaces to fix docs build --- docs/sources/commandline/cli.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/sources/commandline/cli.rst b/docs/sources/commandline/cli.rst index 2adfe48f9..c25b890fa 100644 --- a/docs/sources/commandline/cli.rst +++ b/docs/sources/commandline/cli.rst @@ -565,6 +565,7 @@ Known Issues (kill) -------- :: + Usage: docker load < repository.tar Loads a tarred repository from the standard input stream. From 6014db4a7e8d76580edf995bc974a55dace0c8ba Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Mon, 4 Nov 2013 17:43:57 -0800 Subject: [PATCH 4/9] Setting offline package version to 1.0 --- server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.go b/server.go index 564ae7c0f..a45755038 100644 --- a/server.go +++ b/server.go @@ -219,7 +219,7 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { tmpImageDir := path.Join(tempdir, i.ID) os.Mkdir(tmpImageDir, os.ModeDir) defer os.RemoveAll(tempdir) - var version = "0.7" + var version = "1.0" var versionBuf = []byte(version) ioutil.WriteFile(path.Join(tmpImageDir, "VERSION"), versionBuf, os.ModeAppend) From 844c13bce6429087e2763038136e6485da425741 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Wed, 13 Nov 2013 23:41:42 +0000 Subject: [PATCH 5/9] Fixing build --- server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server.go b/server.go index a45755038..46d27b2ae 100644 --- a/server.go +++ b/server.go @@ -232,7 +232,7 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { ioutil.WriteFile(path.Join(tmpImageDir, "json"), b, os.ModeAppend) // serialize filesystem - fs, err := Tar(path.Join(srv.runtime.graph.Root, i.ID, "layer"), Uncompressed) + fs, err := archive.Tar(path.Join(srv.runtime.graph.Root, i.ID, "layer"), archive.Uncompressed) if err != nil { utils.Debugf("%s", err) return err @@ -269,7 +269,7 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { ioutil.WriteFile(path.Join(tempdir, "repositories"), rootRepoJson, os.ModeAppend) - fs, err := Tar(tempdir, Uncompressed) + fs, err := archive.Tar(tempdir, archive.Uncompressed) defer os.RemoveAll(tempdir) if err != nil { return err @@ -292,7 +292,7 @@ func (srv *Server) ImageLoad(in io.Reader) error { tarFile.Close() repoFile, _ := os.Open(repoTarFile) os.Mkdir(repoDir, os.ModeDir) - Untar(repoFile, repoDir) + archive.Untar(repoFile, repoDir) repositoriesJson, _ := ioutil.ReadFile(path.Join(tmpImageDir, "repo", "repositories")) repositories := map[string]Repository{} json.Unmarshal(repositoriesJson, &repositories) From 1211065c8d81fcc480ddea5d377982cab871d472 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Thu, 14 Nov 2013 01:05:37 +0000 Subject: [PATCH 6/9] Adding content type to images/(name)/get --- api.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api.go b/api.go index cf46ee316..74388d805 100644 --- a/api.go +++ b/api.go @@ -536,6 +536,9 @@ func postImagesPush(srv *Server, version float64, w http.ResponseWriter, r *http func getImagesGet(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error { name := vars["name"] + if version > 1.0 { + w.Header().Set("Content-Type", "application/x-tar") + } err := srv.ImageExport(name, w) if err != nil { return err From 383f95bba1fef213473725fdf6193be0de5b73fd Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Thu, 14 Nov 2013 01:05:46 +0000 Subject: [PATCH 7/9] Adding 1.7 documentation --- docs/sources/api/docker_remote_api_v1.7.rst | 47 +++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/docs/sources/api/docker_remote_api_v1.7.rst b/docs/sources/api/docker_remote_api_v1.7.rst index 13aa5df71..251b16225 100644 --- a/docs/sources/api/docker_remote_api_v1.7.rst +++ b/docs/sources/api/docker_remote_api_v1.7.rst @@ -1171,6 +1171,53 @@ Monitor Docker's events :statuscode 200: no error :statuscode 500: server error +Get a tarball containing all images and tags in a repository +************************************************************ + +.. http:get:: /images/(name)/get + + Get a tarball containing all images and metadata for the repository specified by ``name``. + + **Example request** + + .. sourcecode:: http + + GET /images/ubuntu/get + + **Example response**: + + .. sourcecode:: http + + HTTP/1.1 200 OK + Content-Type: application/x-tar + + Binary data stream + :statuscode 200: no error + :statuscode 500: server error + +Load a tarball with a set of images and tags into docker +******************************************************** + +.. http:post:: /images/load + + Load a set of images and tags into the docker repository. + + **Example request** + + .. sourcecode:: http + + POST /images/load + + Tarball in body + + **Example response**: + + .. sourcecode:: http + + HTTP/1.1 200 OK + + :statuscode 200: no error + :statuscode 500: server error 3. Going further ================ From 0ef6fed5c7b7b1ab4084ecc99880ffc6a7c8eaca Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 18 Nov 2013 11:48:55 -0800 Subject: [PATCH 8/9] Fix error checks for offline transfer and remove unneeded debug output --- server.go | 100 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 66 insertions(+), 34 deletions(-) diff --git a/server.go b/server.go index 46d27b2ae..8b34c024d 100644 --- a/server.go +++ b/server.go @@ -206,7 +206,6 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { // get image json tempdir, err := ioutil.TempDir("", "docker-export-") if err != nil { - utils.Debugf("save", name, "") return err } utils.Debugf("Serializing %s", name) @@ -217,34 +216,38 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { for i := image; i != nil; { // temporary directory tmpImageDir := path.Join(tempdir, i.ID) - os.Mkdir(tmpImageDir, os.ModeDir) + if err := os.Mkdir(tmpImageDir, os.ModeDir); err != nil { + return err + } defer os.RemoveAll(tempdir) + var version = "1.0" var versionBuf = []byte(version) - ioutil.WriteFile(path.Join(tmpImageDir, "VERSION"), versionBuf, os.ModeAppend) + + if err := ioutil.WriteFile(path.Join(tmpImageDir, "VERSION"), versionBuf, os.ModeAppend); err != nil { + return err + } // serialize json b, err := json.Marshal(i) if err != nil { - utils.Debugf("%s", err) return err } - ioutil.WriteFile(path.Join(tmpImageDir, "json"), b, os.ModeAppend) + if err := ioutil.WriteFile(path.Join(tmpImageDir, "json"), b, os.ModeAppend); err != nil { + return err + } // serialize filesystem fs, err := archive.Tar(path.Join(srv.runtime.graph.Root, i.ID, "layer"), archive.Uncompressed) if err != nil { - utils.Debugf("%s", err) return err } + fsTar, err := os.Create(path.Join(tmpImageDir, "layer.tar")) if err != nil { - utils.Debugf("%s", err) return err } - _, err = io.Copy(fsTar, fs) - if err != nil { - utils.Debugf("%s", err) + if _, err = io.Copy(fsTar, fs); err != nil { return err } fsTar.Close() @@ -253,7 +256,6 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { if i.Parent != "" { i, err = srv.ImageInspect(i.Parent) if err != nil { - utils.Debugf("%s", err) return err } } else { @@ -267,13 +269,16 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { rootRepoMap[name] = rootRepo rootRepoJson, _ := json.Marshal(rootRepoMap) - ioutil.WriteFile(path.Join(tempdir, "repositories"), rootRepoJson, os.ModeAppend) + if err := ioutil.WriteFile(path.Join(tempdir, "repositories"), rootRepoJson, os.ModeAppend); err != nil { + return err + } fs, err := archive.Tar(tempdir, archive.Uncompressed) - defer os.RemoveAll(tempdir) if err != nil { return err } + defer os.RemoveAll(tempdir) + if _, err := io.Copy(out, fs); err != nil { return err } @@ -283,42 +288,68 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { // Loads a set of images into the repository. This is the complementary of ImageExport. // The input stream is an uncompressed tar ball containing images and metadata. func (srv *Server) ImageLoad(in io.Reader) error { - tmpImageDir, _ := ioutil.TempDir("", "docker-import-") + tmpImageDir, err := ioutil.TempDir("", "docker-import-") + if err != nil { + return err + } defer os.RemoveAll(tmpImageDir) - repoTarFile := path.Join(tmpImageDir, "repo.tar") - repoDir := path.Join(tmpImageDir, "repo") - tarFile, _ := os.Create(repoTarFile) - io.Copy(tarFile, in) + + var ( + repoTarFile = path.Join(tmpImageDir, "repo.tar") + repoDir = path.Join(tmpImageDir, "repo") + ) + + tarFile, err := os.Create(repoTarFile) + if err != nil { + return err + } + if _, err := io.Copy(tarFile, in); err != nil { + return err + } tarFile.Close() - repoFile, _ := os.Open(repoTarFile) - os.Mkdir(repoDir, os.ModeDir) - archive.Untar(repoFile, repoDir) - repositoriesJson, _ := ioutil.ReadFile(path.Join(tmpImageDir, "repo", "repositories")) + + repoFile, err := os.Open(repoTarFile) + if err != nil { + return err + } + if err := os.Mkdir(repoDir, os.ModeDir); err != nil { + return err + } + if err := archive.Untar(repoFile, repoDir); err != nil { + return err + } + repositoriesJson, err := ioutil.ReadFile(path.Join(tmpImageDir, "repo", "repositories")) + if err != nil { + return err + } repositories := map[string]Repository{} - json.Unmarshal(repositoriesJson, &repositories) + if err := json.Unmarshal(repositoriesJson, &repositories); err != nil { + return err + } for imageName, tagMap := range repositories { for tag, address := range tagMap { - err := srv.recursiveLoad(address, tmpImageDir) - if err != nil { - utils.Debugf("Error loading repository") + if err := srv.recursiveLoad(address, tmpImageDir); err != nil { + return err + } + if err := srv.runtime.repositories.Set(imageName, tag, address, true); err != nil { + return err } - srv.runtime.repositories.Set(imageName, tag, address, true) } } return nil } func (srv *Server) recursiveLoad(address, tmpImageDir string) error { - _, err := srv.ImageInspect(address) - utils.Debugf("Attempting to load %s", "address") - if err != nil { + if _, err := srv.ImageInspect(address); err != nil { utils.Debugf("Loading %s", address) + imageJson, err := ioutil.ReadFile(path.Join(tmpImageDir, "repo", address, "json")) if err != nil { return err utils.Debugf("Error reading json", err) } + layer, err := os.Open(path.Join(tmpImageDir, "repo", address, "layer.tar")) if err != nil { utils.Debugf("Error reading embedded tar", err) @@ -331,12 +362,13 @@ func (srv *Server) recursiveLoad(address, tmpImageDir string) error { } if img.Parent != "" { if !srv.runtime.graph.Exists(img.Parent) { - srv.recursiveLoad(img.Parent, tmpImageDir) + if err := srv.recursiveLoad(img.Parent, tmpImageDir); err != nil { + return err + } } } - err = srv.runtime.graph.Register(imageJson, layer, img) - if err != nil { - utils.Debugf("Error registering image") + if err := srv.runtime.graph.Register(imageJson, layer, img); err != nil { + return err } } utils.Debugf("Completed processing %s", address) From 9de45904980dba224e8ab133f12cfc53835e2dd4 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 18 Nov 2013 12:34:34 -0800 Subject: [PATCH 9/9] Add typo in remove all. Ensure tmpDir is removed --- server.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server.go b/server.go index 8b34c024d..de6520c24 100644 --- a/server.go +++ b/server.go @@ -208,6 +208,8 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { if err != nil { return err } + defer os.RemoveAll(tempdir) + utils.Debugf("Serializing %s", name) rootRepo := srv.runtime.repositories.Repositories[name] @@ -219,7 +221,7 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { if err := os.Mkdir(tmpImageDir, os.ModeDir); err != nil { return err } - defer os.RemoveAll(tempdir) + defer os.RemoveAll(tmpImageDir) var version = "1.0" var versionBuf = []byte(version) @@ -277,7 +279,6 @@ func (srv *Server) ImageExport(name string, out io.Writer) error { if err != nil { return err } - defer os.RemoveAll(tempdir) if _, err := io.Copy(out, fs); err != nil { return err