docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15116 from ibuildthecloud/devices 

Revert change to make ParseDevice unexported
This commit is contained in:
Tibor Vass 2015-07-29 14:42:30 -04:00
parent 0a2ec227f8 421786e925
commit 2a593bea12
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runconfig/parse.go
View File

@ -283,7 +283,7 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe
// parse device mappings // parse device mappings
deviceMappings := []DeviceMapping{} deviceMappings := []DeviceMapping{}
for _, device := range flDevices.GetAll() { for _, device := range flDevices.GetAll() {
deviceMapping, err := parseDevice(device) deviceMapping, err := ParseDevice(device)
if err != nil { if err != nil {
return nil, nil, cmd, err return nil, nil, cmd, err
} }
@ -487,7 +487,8 @@ func parseKeyValueOpts(opts opts.ListOpts) ([]KeyValuePair, error) {
return out, nil return out, nil
} }
func parseDevice(device string) (DeviceMapping, error) { // ParseDevice parses a device mapping string to a DeviceMapping struct
func ParseDevice(device string) (DeviceMapping, error) {
src := "" src := ""
dst := "" dst := ""
permissions := "rwm" permissions := "rwm"