1. docker
  2. Commit b68111713ddab28485122f149055c865ac4dadaa
Browse code

update for consistency

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)

Victor Vieux authored on 2014/07/10 06:47:55
Showing 4 changed files
docker/docker.go
History View file @ b681117
... ... 
@@ -51,7 +51,7 @@ func main() {
51 51 
 		flRoot               = flag.String([]string{"g", "-graph"}, "/var/lib/docker", "Path to use as the root of the Docker runtime")
52 52 
 		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")
53 53 
 		flEnableCors         = flag.Bool([]string{"#api-enable-cors", "-api-enable-cors"}, false, "Enable CORS headers in the remote API")
54 
-		flDns                = opts.NewListOpts(opts.ValidateIpAddress)
54 
+		flDns                = opts.NewListOpts(opts.ValidateIPAddress)
55 55 
 		flDnsSearch          = opts.NewListOpts(opts.ValidateDnsSearch)
56 56 
 		flEnableIptables     = flag.Bool([]string{"#iptables", "-iptables"}, true, "Enable Docker's addition of iptables rules")
57 57 
 		flEnableIpForward    = flag.Bool([]string{"#ip-forward", "-ip-forward"}, true, "Enable net.ipv4.ip_forward")
opts/opts.go
History View file @ b681117
... ... 
@@ -2,12 +2,13 @@ package opts
2 2
3 3 
 import (
4 4 
 	"fmt"
5 
-	"github.com/dotcloud/docker/utils"
6 5 
 	"net"
7 6 
 	"os"
8 7 
 	"path/filepath"
9 8 
 	"regexp"
10 9 
 	"strings"
10 
+
11 
+	"github.com/dotcloud/docker/utils"
11 12 
 )
12 13
13 14 
 // ListOpts type
... ... 
@@ -129,7 +130,7 @@ func ValidateEnv(val string) (string, error) {
129 129 
 	return fmt.Sprintf("%s=%s", val, os.Getenv(val)), nil
130 130 
 }
131 131
132 
-func ValidateIpAddress(val string) (string, error) {
132 
+func ValidateIPAddress(val string) (string, error) {
133 133 
 	var ip = net.ParseIP(strings.TrimSpace(val))
134 134 
 	if ip != nil {
135 135 
 		return ip.String(), nil
opts/opts_test.go
History View file @ b681117
... ... 
@@ -4,25 +4,25 @@ import (
4 4 
 	"testing"
5 5 
 )
6 6
7 
-func TestValidateIP4(t *testing.T) {
8 
-	if ret, err := ValidateIpAddress(`1.2.3.4`); err != nil || ret == "" {
9 
-		t.Fatalf("ValidateIpAddress(`1.2.3.4`) got %s %s", ret, err)
7 
+func TestValidateIPAddress(t *testing.T) {
8 
+	if ret, err := ValidateIPAddress(`1.2.3.4`); err != nil || ret == "" {
9 
+		t.Fatalf("ValidateIPAddress(`1.2.3.4`) got %s %s", ret, err)
10 10 
 	}
11 11
12 
-	if ret, err := ValidateIpAddress(`127.0.0.1`); err != nil || ret == "" {
13 
-		t.Fatalf("ValidateIpAddress(`127.0.0.1`) got %s %s", ret, err)
12 
+	if ret, err := ValidateIPAddress(`127.0.0.1`); err != nil || ret == "" {
13 
+		t.Fatalf("ValidateIPAddress(`127.0.0.1`) got %s %s", ret, err)
14 14 
 	}
15 15
16 
-	if ret, err := ValidateIpAddress(`::1`); err != nil || ret == "" {
17 
-		t.Fatalf("ValidateIpAddress(`::1`) got %s %s", ret, err)
16 
+	if ret, err := ValidateIPAddress(`::1`); err != nil || ret == "" {
17 
+		t.Fatalf("ValidateIPAddress(`::1`) got %s %s", ret, err)
18 18 
 	}
19 19
20 
-	if ret, err := ValidateIpAddress(`127`); err == nil || ret != "" {
21 
-		t.Fatalf("ValidateIpAddress(`127`) got %s %s", ret, err)
20 
+	if ret, err := ValidateIPAddress(`127`); err == nil || ret != "" {
21 
+		t.Fatalf("ValidateIPAddress(`127`) got %s %s", ret, err)
22 22 
 	}
23 23
24 
-	if ret, err := ValidateIpAddress(`random invalid string`); err == nil || ret != "" {
25 
-		t.Fatalf("ValidateIpAddress(`random invalid string`) got %s %s", ret, err)
24 
+	if ret, err := ValidateIPAddress(`random invalid string`); err == nil || ret != "" {
25 
+		t.Fatalf("ValidateIPAddress(`random invalid string`) got %s %s", ret, err)
26 26 
 	}
27 27
28 28 
 }
runconfig/parse.go
History View file @ b681117
... ... 
@@ -44,7 +44,7 @@ func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Conf
44 44
45 45 
 		flPublish     opts.ListOpts
46 46 
 		flExpose      opts.ListOpts
47 
-		flDns         = opts.NewListOpts(opts.ValidateIpAddress)
47 
+		flDns         = opts.NewListOpts(opts.ValidateIPAddress)
48 48 
 		flDnsSearch   = opts.NewListOpts(opts.ValidateDnsSearch)
49 49 
 		flVolumesFrom opts.ListOpts
50 50 
 		flLxcOpts     opts.ListOpts