beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve 'no matching manifest' error

Browse source 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
This commit is contained in:
Stefan Scherer 2019-01-15 18:24:15 +01:00
parent 508e5f7b70
commit 4b9db209fe
No known key found for this signature in database
GPG key ID: 5966AEAC37E957FA
4 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
distribution/pull_v2.go
View file

@ -756,7 +756,7 @@ func (p *v2Puller) pullManifestList(ctx context.Context, ref reference.Named, mf
manifestMatches := filterManifests(mfstList.Manifests, platform)
if len(manifestMatches) == 0 {
errMsg := fmt.Sprintf("no matching manifest for %s in the manifest list entries", platforms.Format(platform))
errMsg := fmt.Sprintf("no matching manifest for %s in the manifest list entries", formatPlatform(platform))
logrus.Debugf(errMsg)
return "", "", errors.New(errMsg)
}

23
distribution/pull_v2_test.go
View file

@ -2,8 +2,10 @@ package distribution // import "github.com/docker/docker/distribution"
import (
"encoding/json"
"fmt"
"io/ioutil"
"reflect"
"regexp"
"runtime"
"strings"
"testing"
@ -11,6 +13,7 @@ import (
"github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/reference"
"github.com/opencontainers/go-digest"
specs "github.com/opencontainers/image-spec/specs-go/v1"
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
)
@ -182,3 +185,23 @@ func TestValidateManifest(t *testing.T) {
t.Fatal("expected validateManifest to fail with digest error")
}
}
func TestFormatPlatform(t *testing.T) {
var platform specs.Platform
var result = formatPlatform(platform)
if strings.HasPrefix(result, "unknown") {
t.Fatal("expected formatPlatform to show a known platform")
}
if !strings.HasPrefix(result, runtime.GOOS) {
t.Fatal("expected formatPlatform to show the current platform")
}
if runtime.GOOS == "windows" {
if !strings.HasPrefix(result, "windows") {
t.Fatal("expected formatPlatform to show windows platform")
}
matches, _ := regexp.MatchString("windows.* [0-9]", result)
if !matches {
t.Fatal(fmt.Sprintf("expected formatPlatform to show windows platform with a version, but got '%s'", result))
}
}
}

7
distribution/pull_v2_unix.go
View file

@ -58,3 +58,10 @@ func withDefault(p specs.Platform) specs.Platform {
}
return p
}
func formatPlatform(platform specs.Platform) string {
if platform.OS == "" {
platform = platforms.DefaultSpec()
}
return platforms.Format(platform)
}

8
distribution/pull_v2_windows.go
View file

@ -11,6 +11,7 @@ import (
"strconv"
"strings"
"github.com/containerd/containerd/platforms"
"github.com/docker/distribution"
"github.com/docker/distribution/manifest/manifestlist"
"github.com/docker/distribution/manifest/schema2"
@ -136,3 +137,10 @@ func checkImageCompatibility(imageOS, imageOSVersion string) error {
}
return nil
}
func formatPlatform(platform specs.Platform) string {
if platform.OS == "" {
platform = platforms.DefaultSpec()
}
return fmt.Sprintf("%s %s", platforms.Format(platform), system.GetOSVersion().ToString())
}