Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rebase to Docker Distribution v2.6.2 #15694

Merged
merged 5 commits into from
Aug 31, 2017
Merged

rebase to Docker Distribution v2.6.2 #15694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b96873
bump(github.com/docker/distribution): 48294d928ced5dd9b378f7fd7c6f5da…
Aug 9, 2017
f81df04
UPSTREAM: docker/distribution: <carry>: add README.md to docker/distr…
Aug 9, 2017
fe7b6b6
UPSTREAM: docker/distribution: <carry>: custom routes/auth
May 8, 2015
314849b
UPSTREAM: docker/distribution: 2299: Fix signalling Wait in regulator…
Jun 2, 2017
e6bc3b6
Fix imports
Aug 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
341 changes: 251 additions & 90 deletions Godeps/Godeps.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pkg/dockerregistry/testutil/manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/docker/distribution/reference"
distclient "github.com/docker/distribution/registry/client"
"github.com/docker/distribution/registry/client/auth"
"github.com/docker/distribution/registry/client/auth/challenge"
"github.com/docker/distribution/registry/client/transport"
"github.com/docker/libtrust"

Expand Down Expand Up @@ -225,7 +226,7 @@ func CreateAndUploadTestManifest(

var rt http.RoundTripper
if creds != nil {
challengeManager := auth.NewSimpleChallengeManager()
challengeManager := challenge.NewSimpleManager()
_, err := ping(challengeManager, serverURL.String()+"/v2/", "")
if err != nil {
return "", "", "", nil, err
Expand Down
5 changes: 3 additions & 2 deletions pkg/dockerregistry/testutil/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/docker/distribution/reference"
distclient "github.com/docker/distribution/registry/client"
"github.com/docker/distribution/registry/client/auth"
"github.com/docker/distribution/registry/client/auth/challenge"
"github.com/docker/distribution/registry/client/transport"

imageapi "github.com/openshift/origin/pkg/image/apis/image"
Expand All @@ -40,7 +41,7 @@ func UploadBlob(

var rt http.RoundTripper
if creds != nil {
challengeManager := auth.NewSimpleChallengeManager()
challengeManager := challenge.NewSimpleManager()
_, err := ping(challengeManager, serverURL.String()+"/v2/", "")
if err != nil {
return distribution.Descriptor{}, err
Expand Down Expand Up @@ -233,7 +234,7 @@ func (tcs *testCredentialStore) SetRefreshToken(u *url.URL, service string, toke

// ping pings the provided endpoint to determine its required authorization challenges.
// If a version header is provided, the versions will be returned.
func ping(manager auth.ChallengeManager, endpoint, versionHeader string) ([]auth.APIVersion, error) {
func ping(manager challenge.Manager, endpoint, versionHeader string) ([]auth.APIVersion, error) {
resp, err := http.Get(endpoint)
if err != nil {
return nil, err
Expand Down
5 changes: 3 additions & 2 deletions pkg/image/importer/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/docker/distribution/registry/api/errcode"
registryclient "github.com/docker/distribution/registry/client"
"github.com/docker/distribution/registry/client/auth"
"github.com/docker/distribution/registry/client/auth/challenge"
"github.com/docker/distribution/registry/client/transport"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -45,14 +46,14 @@ func NewContext(transport, insecureTransport http.RoundTripper) Context {
return Context{
Transport: transport,
InsecureTransport: insecureTransport,
Challenges: auth.NewSimpleChallengeManager(),
Challenges: challenge.NewSimpleManager(),
}
}

type Context struct {
Transport http.RoundTripper
InsecureTransport http.RoundTripper
Challenges auth.ChallengeManager
Challenges challenge.Manager
}

func (c Context) WithCredentials(credentials auth.CredentialStore) RepositoryRetriever {
Expand Down
12 changes: 1 addition & 11 deletions vendor/github.com/denverdino/aliyungo/common/regions.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/docker/distribution/.mailmap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 43 additions & 8 deletions vendor/github.com/docker/distribution/AUTHORS
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/distribution/BUILDING.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

89 changes: 84 additions & 5 deletions vendor/github.com/docker/distribution/CHANGELOG.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.