From ac392bc0d775455f71da3c71956f9f6ae7a87f6d Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Sat, 5 Jul 2014 16:20:14 -0400 Subject: [PATCH 1/2] docker save: fix the 'repositories' file For various use cases, the 'repositories' file does not match expected behavior. Like, docker save busybox:latest | tar t Before: [...] busybox:latest/ busybox:latest/VERSION busybox:latest/json busybox:latest/layer.tar # note, the layer name, and lack of 'repositories' file Now: [...] a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/ a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/VERSION a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/json a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/layer.tar repositories # and the repositories file is correct for the single tagged # image. #> {"busybox":{"latest":"a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721"}} and docker save a9eb17255234 | tar t Before: [...] a9eb17255234/ a9eb17255234/VERSION a9eb17255234/json a9eb17255234/layer.tar # Note the truncated layer name Now: [...] a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/ a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/VERSION a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/json a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/layer.tar # There is no 'repositories' file, because there is no named repo Docker-DCO-1.1-Signed-off-by: Vincent Batts (github: vbatts) --- server/server.go | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/server/server.go b/server/server.go index 7e453a3f0f..0d083ad9a4 100644 --- a/server/server.go +++ b/server/server.go @@ -351,29 +351,52 @@ func (srv *Server) ImageExport(job *engine.Job) engine.Status { utils.Debugf("Serializing %s", name) + rootRepoMap := map[string]graph.Repository{} rootRepo, err := srv.daemon.Repositories().Get(name) if err != nil { return job.Error(err) } if rootRepo != nil { + // this is a base repo name, like 'busybox' + for _, id := range rootRepo { if err := srv.exportImage(job.Eng, id, tempdir); err != nil { return job.Error(err) } } - - // write repositories - rootRepoMap := map[string]graph.Repository{} rootRepoMap[name] = rootRepo + } else { + img, err := srv.daemon.Repositories().LookupImage(name) + if err != nil { + return job.Error(err) + } + if img != nil { + // This is a named image like 'busybox:latest' + repoName, repoTag := utils.ParseRepositoryTag(name) + if err := srv.exportImage(job.Eng, img.ID, tempdir); err != nil { + return job.Error(err) + } + // check this length, because a lookup of a truncated has will not have a tag + // and will not need to be added to this map + if len(repoTag) > 0 { + rootRepoMap[repoName] = graph.Repository{repoTag: img.ID} + } + } else { + // this must be an ID that didn't get looked up just right? + if err := srv.exportImage(job.Eng, name, tempdir); err != nil { + return job.Error(err) + } + } + } + // write repositories, if there is something to write + if len(rootRepoMap) > 0 { rootRepoJson, _ := json.Marshal(rootRepoMap) if err := ioutil.WriteFile(path.Join(tempdir, "repositories"), rootRepoJson, os.FileMode(0644)); err != nil { return job.Error(err) } } else { - if err := srv.exportImage(job.Eng, name, tempdir); err != nil { - return job.Error(err) - } + utils.Debugf("There were no repositories to write") } fs, err := archive.Tar(tempdir, archive.Uncompressed) From 600f65b24786d15a382877da4c3ae77d88e252bb Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Mon, 7 Jul 2014 14:58:27 -0400 Subject: [PATCH 2/2] docker save: more integration tests Docker-DCO-1.1-Signed-off-by: Vincent Batts (github: vbatts) --- integration-cli/docker_cli_save_load_test.go | 57 ++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go index fb94cad9d8..c70769e034 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -59,6 +59,63 @@ func TestSaveAndLoadRepoStdout(t *testing.T) { logDone("load - load a repo using stdout") } +func TestSaveSingleTag(t *testing.T) { + repoName := "foobar-save-single-tag-test" + + tagCmdFinal := fmt.Sprintf("%v tag busybox:latest %v:latest", dockerBinary, repoName) + tagCmd := exec.Command("bash", "-c", tagCmdFinal) + out, _, err := runCommandWithOutput(tagCmd) + errorOut(err, t, fmt.Sprintf("failed to tag repo: %v %v", out, err)) + + idCmdFinal := fmt.Sprintf("%v images -q --no-trunc %v", dockerBinary, repoName) + idCmd := exec.Command("bash", "-c", idCmdFinal) + out, _, err = runCommandWithOutput(idCmd) + errorOut(err, t, fmt.Sprintf("failed to get repo ID: %v %v", out, err)) + + cleanedImageID := stripTrailingCharacters(out) + + saveCmdFinal := fmt.Sprintf("%v save %v:latest | tar t | grep -E '(^repositories$|%v)'", dockerBinary, repoName, cleanedImageID) + saveCmd := exec.Command("bash", "-c", saveCmdFinal) + out, _, err = runCommandWithOutput(saveCmd) + errorOut(err, t, fmt.Sprintf("failed to save repo with image ID and 'repositories' file: %v %v", out, err)) + + deleteImages(repoName) + + logDone("save - save a specific image:tag") +} + +func TestSaveImageId(t *testing.T) { + repoName := "foobar-save-image-id-test" + + tagCmdFinal := fmt.Sprintf("%v tag scratch:latest %v:latest", dockerBinary, repoName) + tagCmd := exec.Command("bash", "-c", tagCmdFinal) + out, _, err := runCommandWithOutput(tagCmd) + errorOut(err, t, fmt.Sprintf("failed to tag repo: %v %v", out, err)) + + idLongCmdFinal := fmt.Sprintf("%v images -q --no-trunc %v", dockerBinary, repoName) + idLongCmd := exec.Command("bash", "-c", idLongCmdFinal) + out, _, err = runCommandWithOutput(idLongCmd) + errorOut(err, t, fmt.Sprintf("failed to get repo ID: %v %v", out, err)) + + cleanedLongImageID := stripTrailingCharacters(out) + + idShortCmdFinal := fmt.Sprintf("%v images -q %v", dockerBinary, repoName) + idShortCmd := exec.Command("bash", "-c", idShortCmdFinal) + out, _, err = runCommandWithOutput(idShortCmd) + errorOut(err, t, fmt.Sprintf("failed to get repo short ID: %v %v", out, err)) + + cleanedShortImageID := stripTrailingCharacters(out) + + saveCmdFinal := fmt.Sprintf("%v save %v | tar t | grep %v", dockerBinary, cleanedShortImageID, cleanedLongImageID) + saveCmd := exec.Command("bash", "-c", saveCmdFinal) + out, _, err = runCommandWithOutput(saveCmd) + errorOut(err, t, fmt.Sprintf("failed to save repo with image ID: %v %v", out, err)) + + deleteImages(repoName) + + logDone("save - save a image by ID") +} + // save a repo and try to load it using flags func TestSaveAndLoadRepoFlags(t *testing.T) { runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "true")