1
0
mirror of https://github.com/rancher/os.git synced 2025-09-01 06:40:31 +00:00

Imports are organized in groups, with blank lines between them

https://github.com/golang/go/wiki/CodeReviewComments#imports
This commit is contained in:
niusmallnan
2018-10-23 12:13:32 +08:00
committed by niusmallnan
parent ef663b4e70
commit 823ae28a52
66 changed files with 174 additions and 162 deletions

View File

@@ -5,11 +5,12 @@ import (
"fmt"
"strings"
"github.com/rancher/os/config"
"github.com/rancher/os/pkg/log"
"github.com/docker/docker/registry"
"github.com/docker/engine-api/types"
"github.com/docker/libcompose/docker"
"github.com/rancher/os/config"
"github.com/rancher/os/pkg/log"
)
// ConfigAuthLookup will lookup registry auth info from cloud config

View File

@@ -1,8 +1,9 @@
package docker
import (
dockerClient "github.com/docker/engine-api/client"
"github.com/rancher/os/config"
dockerClient "github.com/docker/engine-api/client"
"golang.org/x/net/context"
)

View File

@@ -4,14 +4,14 @@ import (
"fmt"
"sync"
"golang.org/x/net/context"
"github.com/rancher/os/config"
"github.com/rancher/os/pkg/log"
"github.com/rancher/os/pkg/util"
dockerclient "github.com/docker/engine-api/client"
composeClient "github.com/docker/libcompose/docker/client"
"github.com/docker/libcompose/project"
"github.com/rancher/os/config"
"github.com/rancher/os/pkg/log"
"github.com/rancher/os/pkg/util"
"golang.org/x/net/context"
)
type ClientFactory struct {

View File

@@ -4,9 +4,10 @@ import (
"fmt"
"strings"
composeConfig "github.com/docker/libcompose/config"
"github.com/rancher/os/config"
"github.com/rancher/os/pkg/log"
composeConfig "github.com/docker/libcompose/config"
)
type ConfigEnvironment struct {

View File

@@ -3,14 +3,15 @@ package docker
import (
"fmt"
"github.com/rancher/os/config"
"github.com/rancher/os/pkg/log"
dockerclient "github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
composeConfig "github.com/docker/libcompose/config"
"github.com/docker/libcompose/docker"
"github.com/docker/libcompose/project"
"github.com/docker/libcompose/project/options"
"github.com/rancher/os/config"
"github.com/rancher/os/pkg/log"
"golang.org/x/net/context"
)

View File

@@ -1,10 +1,11 @@
package docker
import (
"github.com/rancher/os/pkg/util"
composeConfig "github.com/docker/libcompose/config"
"github.com/docker/libcompose/docker"
"github.com/docker/libcompose/project"
"github.com/rancher/os/pkg/util"
)
type ServiceFactory struct {

View File

@@ -1,8 +1,9 @@
package docker
import (
composeConfig "github.com/docker/libcompose/config"
"github.com/rancher/os/config"
composeConfig "github.com/docker/libcompose/config"
)
func IsSystemContainer(serviceConfig *composeConfig.ServiceConfig) bool {