-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1769 from thaJeztah/bump_docker
vendor: github.com/docker/docker v20.10.0-beta1.0.20201030232932-c2cc352355d4
- Loading branch information
Showing
245 changed files
with
3,307 additions
and
13,513 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "strings" | ||
|
|
||
| "github.com/docker/docker/pkg/idtools" | ||
| "github.com/pkg/errors" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| func parseIdentityMapping(str string) (*idtools.IdentityMapping, error) { | ||
| if str == "" { | ||
| return nil, nil | ||
| } | ||
|
|
||
| idparts := strings.SplitN(str, ":", 3) | ||
| if len(idparts) > 2 { | ||
| return nil, errors.Errorf("invalid userns remap specification in %q", str) | ||
| } | ||
|
|
||
| username := idparts[0] | ||
|
|
||
| logrus.Debugf("user namespaces: ID ranges will be mapped to subuid ranges of: %s", username) | ||
|
|
||
| mappings, err := idtools.NewIdentityMapping(username) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to create ID mappings") | ||
| } | ||
| return mappings, nil | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // +build !linux | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "github.com/docker/docker/pkg/idtools" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| func parseIdentityMapping(str string) (*idtools.IdentityMapping, error) { | ||
| if str == "" { | ||
| return nil, nil | ||
| } | ||
| return nil, errors.New("user namespaces are only supported on linux") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.