kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

update for consistency

Browse source 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
This commit is contained in:
Victor Vieux 2014-07-09 21:47:55 +00:00
parent 0abdea9094
commit b68111713d
4 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docker/docker.go
View file

@ -51,7 +51,7 @@ func main() {
flRoot = flag.String([]string{"g", "-graph"}, "/var/lib/docker", "Path to use as the root of the Docker runtime") flRoot = flag.String([]string{"g", "-graph"}, "/var/lib/docker", "Path to use as the root of the Docker runtime")
flSocketGroup = flag.String([]string{"G", "-group"}, "docker", "Group to assign the unix socket specified by -H when running in daemon mode\nuse '' (the empty string) to disable setting of a group") flSocketGroup = flag.String([]string{"G", "-group"}, "docker", "Group to assign the unix socket specified by -H when running in daemon mode\nuse '' (the empty string) to disable setting of a group")
flEnableCors = flag.Bool([]string{"#api-enable-cors", "-api-enable-cors"}, false, "Enable CORS headers in the remote API") flEnableCors = flag.Bool([]string{"#api-enable-cors", "-api-enable-cors"}, false, "Enable CORS headers in the remote API")
flDns = opts.NewListOpts(opts.ValidateIpAddress) flDns = opts.NewListOpts(opts.ValidateIPAddress)
flDnsSearch = opts.NewListOpts(opts.ValidateDnsSearch) flDnsSearch = opts.NewListOpts(opts.ValidateDnsSearch)
flEnableIptables = flag.Bool([]string{"#iptables", "-iptables"}, true, "Enable Docker's addition of iptables rules") flEnableIptables = flag.Bool([]string{"#iptables", "-iptables"}, true, "Enable Docker's addition of iptables rules")
flEnableIpForward = flag.Bool([]string{"#ip-forward", "-ip-forward"}, true, "Enable net.ipv4.ip_forward") flEnableIpForward = flag.Bool([]string{"#ip-forward", "-ip-forward"}, true, "Enable net.ipv4.ip_forward")

5
opts/opts.go
View file

@ -2,12 +2,13 @@ package opts
import ( import (
"fmt" "fmt"
"github.com/dotcloud/docker/utils"
"net" "net"
"os" "os"
"path/filepath" "path/filepath"
"regexp" "regexp"
"strings" "strings"
"github.com/dotcloud/docker/utils"
) )
// ListOpts type // ListOpts type
@ -129,7 +130,7 @@ func ValidateEnv(val string) (string, error) {
return fmt.Sprintf("%s=%s", val, os.Getenv(val)), nil return fmt.Sprintf("%s=%s", val, os.Getenv(val)), nil
} }
func ValidateIpAddress(val string) (string, error) { func ValidateIPAddress(val string) (string, error) {
var ip = net.ParseIP(strings.TrimSpace(val)) var ip = net.ParseIP(strings.TrimSpace(val))
if ip != nil { if ip != nil {
return ip.String(), nil return ip.String(), nil

22
opts/opts_test.go
View file

@ -4,25 +4,25 @@ import (
"testing" "testing"
) )
func TestValidateIP4(t *testing.T) { func TestValidateIPAddress(t *testing.T) {
if ret, err := ValidateIpAddress(`1.2.3.4`); err != nil || ret == "" { if ret, err := ValidateIPAddress(`1.2.3.4`); err != nil || ret == "" {
t.Fatalf("ValidateIpAddress(`1.2.3.4`) got %s %s", ret, err) t.Fatalf("ValidateIPAddress(`1.2.3.4`) got %s %s", ret, err)
} }
if ret, err := ValidateIpAddress(`127.0.0.1`); err != nil || ret == "" { if ret, err := ValidateIPAddress(`127.0.0.1`); err != nil || ret == "" {
t.Fatalf("ValidateIpAddress(`127.0.0.1`) got %s %s", ret, err) t.Fatalf("ValidateIPAddress(`127.0.0.1`) got %s %s", ret, err)
} }
if ret, err := ValidateIpAddress(`::1`); err != nil || ret == "" { if ret, err := ValidateIPAddress(`::1`); err != nil || ret == "" {
t.Fatalf("ValidateIpAddress(`::1`) got %s %s", ret, err) t.Fatalf("ValidateIPAddress(`::1`) got %s %s", ret, err)
} }
if ret, err := ValidateIpAddress(`127`); err == nil || ret != "" { if ret, err := ValidateIPAddress(`127`); err == nil || ret != "" {
t.Fatalf("ValidateIpAddress(`127`) got %s %s", ret, err) t.Fatalf("ValidateIPAddress(`127`) got %s %s", ret, err)
} }
if ret, err := ValidateIpAddress(`random invalid string`); err == nil || ret != "" { if ret, err := ValidateIPAddress(`random invalid string`); err == nil || ret != "" {
t.Fatalf("ValidateIpAddress(`random invalid string`) got %s %s", ret, err) t.Fatalf("ValidateIPAddress(`random invalid string`) got %s %s", ret, err)
} }
} }

2
runconfig/parse.go
View file

@ -44,7 +44,7 @@ func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Conf
flPublish opts.ListOpts flPublish opts.ListOpts
flExpose opts.ListOpts flExpose opts.ListOpts
flDns = opts.NewListOpts(opts.ValidateIpAddress) flDns = opts.NewListOpts(opts.ValidateIPAddress)
flDnsSearch = opts.NewListOpts(opts.ValidateDnsSearch) flDnsSearch = opts.NewListOpts(opts.ValidateDnsSearch)
flVolumesFrom opts.ListOpts flVolumesFrom opts.ListOpts
flLxcOpts opts.ListOpts flLxcOpts opts.ListOpts