mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
810d3b2642
pushV2Tag already deduplicates layers, but the scope of this deduplication is only for a particular tag. If we are pushing all tags in a repository, we may check layers several times. Fix this by moving the layersSeen map from the pushV2Tag function to the v2Pusher struct. In addition to avoiding some useless round-trips, this makes the "docker push" output less confusing. It formerly could contain many repeated lines like: 124e2127157f: Image already exists 124e2127157f: Image already exists ... Add test coverage based on the "docker push" output: a hash should not appear multiple times when pushing multiple tags. Fixes #14873 Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
145 lines
5 KiB
Go
145 lines
5 KiB
Go
package main
|
|
|
|
import (
|
|
"archive/tar"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
// Pushing an image to a private registry.
|
|
func (s *DockerRegistrySuite) TestPushBusyboxImage(c *check.C) {
|
|
repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
|
|
// tag the image to upload it to the private registry
|
|
dockerCmd(c, "tag", "busybox", repoName)
|
|
// push the image to the registry
|
|
dockerCmd(c, "push", repoName)
|
|
}
|
|
|
|
// pushing an image without a prefix should throw an error
|
|
func (s *DockerSuite) TestPushUnprefixedRepo(c *check.C) {
|
|
if out, _, err := dockerCmdWithError(c, "push", "busybox"); err == nil {
|
|
c.Fatalf("pushing an unprefixed repo didn't result in a non-zero exit status: %s", out)
|
|
}
|
|
}
|
|
|
|
func (s *DockerRegistrySuite) TestPushUntagged(c *check.C) {
|
|
repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
|
|
|
|
expected := "Repository does not exist"
|
|
if out, _, err := dockerCmdWithError(c, "push", repoName); err == nil {
|
|
c.Fatalf("pushing the image to the private registry should have failed: output %q", out)
|
|
} else if !strings.Contains(out, expected) {
|
|
c.Fatalf("pushing the image failed with an unexpected message: expected %q, got %q", expected, out)
|
|
}
|
|
}
|
|
|
|
func (s *DockerRegistrySuite) TestPushBadTag(c *check.C) {
|
|
repoName := fmt.Sprintf("%v/dockercli/busybox:latest", privateRegistryURL)
|
|
|
|
expected := "does not exist"
|
|
|
|
if out, _, err := dockerCmdWithError(c, "push", repoName); err == nil {
|
|
c.Fatalf("pushing the image to the private registry should have failed: output %q", out)
|
|
} else if !strings.Contains(out, expected) {
|
|
c.Fatalf("pushing the image failed with an unexpected message: expected %q, got %q", expected, out)
|
|
}
|
|
}
|
|
|
|
func (s *DockerRegistrySuite) TestPushMultipleTags(c *check.C) {
|
|
repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
|
|
repoTag1 := fmt.Sprintf("%v/dockercli/busybox:t1", privateRegistryURL)
|
|
repoTag2 := fmt.Sprintf("%v/dockercli/busybox:t2", privateRegistryURL)
|
|
// tag the image and upload it to the private registry
|
|
dockerCmd(c, "tag", "busybox", repoTag1)
|
|
|
|
dockerCmd(c, "tag", "busybox", repoTag2)
|
|
|
|
out, _ := dockerCmd(c, "push", repoName)
|
|
|
|
// There should be no duplicate hashes in the output
|
|
imageSuccessfullyPushed := ": Image successfully pushed"
|
|
imageAlreadyExists := ": Image already exists"
|
|
imagePushHashes := make(map[string]struct{})
|
|
outputLines := strings.Split(out, "\n")
|
|
for _, outputLine := range outputLines {
|
|
if strings.Contains(outputLine, imageSuccessfullyPushed) {
|
|
hash := strings.TrimSuffix(outputLine, imageSuccessfullyPushed)
|
|
if _, present := imagePushHashes[hash]; present {
|
|
c.Fatalf("Duplicate image push: %s", outputLine)
|
|
}
|
|
imagePushHashes[hash] = struct{}{}
|
|
} else if strings.Contains(outputLine, imageAlreadyExists) {
|
|
hash := strings.TrimSuffix(outputLine, imageAlreadyExists)
|
|
if _, present := imagePushHashes[hash]; present {
|
|
c.Fatalf("Duplicate image push: %s", outputLine)
|
|
}
|
|
imagePushHashes[hash] = struct{}{}
|
|
}
|
|
}
|
|
|
|
if len(imagePushHashes) == 0 {
|
|
c.Fatal(`Expected at least one line containing "Image successfully pushed"`)
|
|
}
|
|
}
|
|
|
|
func (s *DockerRegistrySuite) TestPushInterrupt(c *check.C) {
|
|
repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
|
|
// tag the image and upload it to the private registry
|
|
dockerCmd(c, "tag", "busybox", repoName)
|
|
|
|
pushCmd := exec.Command(dockerBinary, "push", repoName)
|
|
if err := pushCmd.Start(); err != nil {
|
|
c.Fatalf("Failed to start pushing to private registry: %v", err)
|
|
}
|
|
|
|
// Interrupt push (yes, we have no idea at what point it will get killed).
|
|
time.Sleep(200 * time.Millisecond)
|
|
if err := pushCmd.Process.Kill(); err != nil {
|
|
c.Fatalf("Failed to kill push process: %v", err)
|
|
}
|
|
if out, _, err := dockerCmdWithError(c, "push", repoName); err == nil {
|
|
if !strings.Contains(out, "already in progress") {
|
|
c.Fatalf("Push should be continued on daemon side, but seems ok: %v, %s", err, out)
|
|
}
|
|
}
|
|
// now wait until all this pushes will complete
|
|
// if it failed with timeout - there would be some error,
|
|
// so no logic about it here
|
|
for exec.Command(dockerBinary, "push", repoName).Run() != nil {
|
|
}
|
|
}
|
|
|
|
func (s *DockerRegistrySuite) TestPushEmptyLayer(c *check.C) {
|
|
repoName := fmt.Sprintf("%v/dockercli/emptylayer", privateRegistryURL)
|
|
emptyTarball, err := ioutil.TempFile("", "empty_tarball")
|
|
if err != nil {
|
|
c.Fatalf("Unable to create test file: %v", err)
|
|
}
|
|
tw := tar.NewWriter(emptyTarball)
|
|
err = tw.Close()
|
|
if err != nil {
|
|
c.Fatalf("Error creating empty tarball: %v", err)
|
|
}
|
|
freader, err := os.Open(emptyTarball.Name())
|
|
if err != nil {
|
|
c.Fatalf("Could not open test tarball: %v", err)
|
|
}
|
|
|
|
importCmd := exec.Command(dockerBinary, "import", "-", repoName)
|
|
importCmd.Stdin = freader
|
|
out, _, err := runCommandWithOutput(importCmd)
|
|
if err != nil {
|
|
c.Errorf("import failed with errors: %v, output: %q", err, out)
|
|
}
|
|
|
|
// Now verify we can push it
|
|
if out, _, err := dockerCmdWithError(c, "push", repoName); err != nil {
|
|
c.Fatalf("pushing the image to the private registry has failed: %s, %v", out, err)
|
|
}
|
|
}
|