1. docker
  2. Commit 5a0ef08c940b9a17c400389bca8e7f54935ceba9
Browse code

gofmt -s -w

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

Victor Vieux authored on 2014/07/25 07:25:29
Showing 15 changed files
daemon/container.go
History View file @ 5a0ef08
... ... 
@@ -15,8 +15,6 @@ import (
15 15 
 	"syscall"
16 16 
 	"time"
17 17
18 
-	"github.com/docker/libcontainer/devices"
19 
-	"github.com/docker/libcontainer/label"
20 18 
 	"github.com/docker/docker/archive"
21 19 
 	"github.com/docker/docker/daemon/execdriver"
22 20 
 	"github.com/docker/docker/daemon/graphdriver"
... ... 
@@ -30,6 +28,8 @@ import (
30 30 
 	"github.com/docker/docker/runconfig"
31 31 
 	"github.com/docker/docker/utils"
32 32 
 	"github.com/docker/docker/utils/broadcastwriter"
33 
+	"github.com/docker/libcontainer/devices"
34 
+	"github.com/docker/libcontainer/label"
33 35 
 )
34 36
35 37 
 const DefaultPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
daemon/daemon.go
History View file @ 5a0ef08
... ... 
@@ -12,7 +12,6 @@ import (
12 12 
 	"sync"
13 13 
 	"time"
14 14
15 
-	"github.com/docker/libcontainer/label"
16 15 
 	"github.com/docker/docker/archive"
17 16 
 	"github.com/docker/docker/daemon/execdriver"
18 17 
 	"github.com/docker/docker/daemon/execdriver/execdrivers"
... ... 
@@ -34,6 +33,7 @@ import (
34 34 
 	"github.com/docker/docker/runconfig"
35 35 
 	"github.com/docker/docker/utils"
36 36 
 	"github.com/docker/docker/utils/broadcastwriter"
37 
+	"github.com/docker/libcontainer/label"
37 38 
 )
38 39
39 40 
 // Set the max depth to the aufs default that most
daemon/execdriver/lxc/driver.go
History View file @ 5a0ef08
... ... 
@@ -16,12 +16,12 @@ import (
16 16 
 	"syscall"
17 17 
 	"time"
18 18
19 
-	"github.com/docker/libcontainer/cgroups"
20 
-	"github.com/docker/libcontainer/label"
21 
-	"github.com/docker/libcontainer/mount/nodes"
22 19 
 	"github.com/docker/docker/daemon/execdriver"
23 20 
 	"github.com/docker/docker/pkg/term"
24 21 
 	"github.com/docker/docker/utils"
22 
+	"github.com/docker/libcontainer/cgroups"
23 
+	"github.com/docker/libcontainer/label"
24 
+	"github.com/docker/libcontainer/mount/nodes"
25 25 
 	"github.com/kr/pty"
26 26 
 )
27 27
daemon/execdriver/lxc/init.go
History View file @ 5a0ef08
... ... 
@@ -9,8 +9,8 @@ import (
9 9 
 	"strings"
10 10 
 	"syscall"
11 11
12 
-	"github.com/docker/libcontainer/netlink"
13 12 
 	"github.com/docker/docker/daemon/execdriver"
13 
+	"github.com/docker/libcontainer/netlink"
14 14 
 )
15 15
16 16 
 // Clear environment pollution introduced by lxc-start
daemon/execdriver/lxc/lxc_init_linux.go
History View file @ 5a0ef08
... ... 
@@ -7,12 +7,12 @@ import (
7 7 
 	"strings"
8 8 
 	"syscall"
9 9
10 
-	"github.com/docker/libcontainer/namespaces"
11 
-	"github.com/docker/libcontainer/security/capabilities"
12 
-	"github.com/docker/libcontainer/utils"
13 10 
 	"github.com/docker/docker/daemon/execdriver"
14 11 
 	"github.com/docker/docker/daemon/execdriver/native/template"
15 12 
 	"github.com/docker/docker/pkg/system"
13 
+	"github.com/docker/libcontainer/namespaces"
14 
+	"github.com/docker/libcontainer/security/capabilities"
15 
+	"github.com/docker/libcontainer/utils"
16 16 
 )
17 17
18 18 
 func setHostname(hostname string) error {
daemon/execdriver/lxc/lxc_template.go
History View file @ 5a0ef08
... ... 
@@ -4,8 +4,8 @@ import (
4 4 
 	"strings"
5 5 
 	"text/template"
6 6
7 
-	"github.com/docker/libcontainer/label"
8 7 
 	"github.com/docker/docker/daemon/execdriver"
8 
+	"github.com/docker/libcontainer/label"
9 9 
 )
10 10
11 11 
 const LxcTemplate = `
daemon/execdriver/lxc/lxc_template_unit_test.go
History View file @ 5a0ef08
... ... 
@@ -13,8 +13,8 @@ import (
13 13 
 	"testing"
14 14 
 	"time"
15 15
16 
-	"github.com/docker/libcontainer/devices"
17 16 
 	"github.com/docker/docker/daemon/execdriver"
17 
+	"github.com/docker/libcontainer/devices"
18 18 
 )
19 19
20 20 
 func TestLXCConfig(t *testing.T) {
daemon/execdriver/native/configuration/parse.go
History View file @ 5a0ef08
... ... 
@@ -7,8 +7,8 @@ import (
7 7 
 	"strconv"
8 8 
 	"strings"
9 9
10 
-	"github.com/docker/libcontainer"
11 10 
 	"github.com/docker/docker/pkg/units"
11 
+	"github.com/docker/libcontainer"
12 12 
 )
13 13
14 14 
 type Action func(*libcontainer.Config, interface{}, string) error
daemon/execdriver/native/configuration/parse_test.go
History View file @ 5a0ef08
... ... 
@@ -3,8 +3,8 @@ package configuration
3 3 
 import (
4 4 
 	"testing"
5 5
6 
-	"github.com/docker/libcontainer/security/capabilities"
7 6 
 	"github.com/docker/docker/daemon/execdriver/native/template"
7 
+	"github.com/docker/libcontainer/security/capabilities"
8 8 
 )
9 9
10 10 
 // Checks whether the expected capability is specified in the capabilities.
daemon/execdriver/native/create.go
History View file @ 5a0ef08
... ... 
@@ -8,14 +8,14 @@ import (
8 8 
 	"os/exec"
9 9 
 	"path/filepath"
10 10
11 
+	"github.com/docker/docker/daemon/execdriver"
12 
+	"github.com/docker/docker/daemon/execdriver/native/configuration"
13 
+	"github.com/docker/docker/daemon/execdriver/native/template"
11 14 
 	"github.com/docker/libcontainer"
12 15 
 	"github.com/docker/libcontainer/apparmor"
13 16 
 	"github.com/docker/libcontainer/devices"
14 17 
 	"github.com/docker/libcontainer/mount"
15 18 
 	"github.com/docker/libcontainer/security/capabilities"
16 
-	"github.com/docker/docker/daemon/execdriver"
17 
-	"github.com/docker/docker/daemon/execdriver/native/configuration"
18 
-	"github.com/docker/docker/daemon/execdriver/native/template"
19 19 
 )
20 20
21 21 
 // createContainer populates and configures the container type with the
daemon/execdriver/native/driver.go
History View file @ 5a0ef08
... ... 
@@ -14,15 +14,15 @@ import (
14 14 
 	"sync"
15 15 
 	"syscall"
16 16
17 
+	"github.com/docker/docker/daemon/execdriver"
18 
+	"github.com/docker/docker/pkg/system"
19 
+	"github.com/docker/docker/pkg/term"
17 20 
 	"github.com/docker/libcontainer"
18 21 
 	"github.com/docker/libcontainer/apparmor"
19 22 
 	"github.com/docker/libcontainer/cgroups/fs"
20 23 
 	"github.com/docker/libcontainer/cgroups/systemd"
21 24 
 	"github.com/docker/libcontainer/namespaces"
22 25 
 	"github.com/docker/libcontainer/syncpipe"
23 
-	"github.com/docker/docker/daemon/execdriver"
24 
-	"github.com/docker/docker/pkg/system"
25 
-	"github.com/docker/docker/pkg/term"
26 26 
 )
27 27
28 28 
 const (
daemon/execdriver/utils.go
History View file @ 5a0ef08
... ... 
@@ -4,8 +4,8 @@ import (
4 4 
 	"fmt"
5 5 
 	"strings"
6 6
7 
-	"github.com/docker/libcontainer/security/capabilities"
8 7 
 	"github.com/docker/docker/utils"
8 
+	"github.com/docker/libcontainer/security/capabilities"
9 9 
 )
10 10
11 11 
 func TweakCapabilities(basics, adds, drops []string) ([]string, error) {
daemon/graphdriver/aufs/aufs.go
History View file @ 5a0ef08
... ... 
@@ -30,11 +30,11 @@ import (
30 30 
 	"sync"
31 31 
 	"syscall"
32 32
33 
-	"github.com/docker/libcontainer/label"
34 33 
 	"github.com/docker/docker/archive"
35 34 
 	"github.com/docker/docker/daemon/graphdriver"
36 35 
 	mountpk "github.com/docker/docker/pkg/mount"
37 36 
 	"github.com/docker/docker/utils"
37 
+	"github.com/docker/libcontainer/label"
38 38 
 )
39 39
40 40 
 var (
daemon/graphdriver/devmapper/deviceset.go
History View file @ 5a0ef08
... ... 
@@ -18,10 +18,10 @@ import (
18 18 
 	"syscall"
19 19 
 	"time"
20 20
21 
-	"github.com/docker/libcontainer/label"
22 21 
 	"github.com/docker/docker/daemon/graphdriver"
23 22 
 	"github.com/docker/docker/pkg/units"
24 23 
 	"github.com/docker/docker/utils"
24 
+	"github.com/docker/libcontainer/label"
25 25 
 )
26 26
27 27 
 var (
daemon/networkdriver/bridge/driver.go
History View file @ 5a0ef08
... ... 
@@ -8,7 +8,6 @@ import (
8 8 
 	"strings"
9 9 
 	"sync"
10 10
11 
-	"github.com/docker/libcontainer/netlink"
12 11 
 	"github.com/docker/docker/daemon/networkdriver"
13 12 
 	"github.com/docker/docker/daemon/networkdriver/ipallocator"
14 13 
 	"github.com/docker/docker/daemon/networkdriver/portallocator"
... ... 
@@ -17,6 +16,7 @@ import (
17 17 
 	"github.com/docker/docker/pkg/iptables"
18 18 
 	"github.com/docker/docker/pkg/networkfs/resolvconf"
19 19 
 	"github.com/docker/docker/utils"
20 
+	"github.com/docker/libcontainer/netlink"
20 21 
 )
21 22
22 23 
 const (