Skip to content

Commit 07ff4f1

Browse files
committed
goimports: fix imports
Format the source according to latest goimports. Signed-off-by: Kir Kolyshkin <[email protected]> Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 56e690f commit 07ff4f1

125 files changed

Lines changed: 137 additions & 136 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

api/server/router/distribution/distribution_routes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/docker/docker/api/types"
1616
registrytypes "github.com/docker/docker/api/types/registry"
1717
"github.com/docker/docker/errdefs"
18-
"github.com/opencontainers/image-spec/specs-go/v1"
18+
v1 "github.com/opencontainers/image-spec/specs-go/v1"
1919
"github.com/pkg/errors"
2020
)
2121

api/server/router/system/system.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package system // import "github.com/docker/docker/api/server/router/system"
22

33
import (
44
"github.com/docker/docker/api/server/router"
5-
"github.com/docker/docker/builder/builder-next"
5+
buildkit "github.com/docker/docker/builder/builder-next"
66
"github.com/docker/docker/builder/fscache"
77
)
88

api/types/container/host_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/docker/docker/api/types/mount"
88
"github.com/docker/docker/api/types/strslice"
99
"github.com/docker/go-connections/nat"
10-
"github.com/docker/go-units"
10+
units "github.com/docker/go-units"
1111
)
1212

1313
// CgroupnsMode represents the cgroup namespace mode of the container

api/types/registry/registry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"net"
66

7-
"github.com/opencontainers/image-spec/specs-go/v1"
7+
v1 "github.com/opencontainers/image-spec/specs-go/v1"
88
)
99

1010
// ServiceConfig stores daemon registry services configuration.

builder/builder-next/adapters/containerimage/pull.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"github.com/moby/buildkit/util/progress"
3838
"github.com/moby/buildkit/util/resolver"
3939
"github.com/moby/buildkit/util/tracing"
40-
"github.com/opencontainers/go-digest"
40+
digest "github.com/opencontainers/go-digest"
4141
"github.com/opencontainers/image-spec/identity"
4242
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
4343
"github.com/pkg/errors"

builder/dockerfile/copy_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"path/filepath"
77
"strings"
88

9-
"github.com/Microsoft/go-winio"
9+
winio "github.com/Microsoft/go-winio"
1010
"github.com/docker/docker/pkg/idtools"
1111
"github.com/docker/docker/pkg/reexec"
1212
"github.com/docker/docker/pkg/system"

builder/dockerfile/metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dockerfile // import "github.com/docker/docker/builder/dockerfile"
22

33
import (
4-
"github.com/docker/go-metrics"
4+
metrics "github.com/docker/go-metrics"
55
)
66

77
var (

builder/remotecontext/tarsum.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/docker/docker/pkg/containerfs"
88
iradix "github.com/hashicorp/go-immutable-radix"
9-
"github.com/opencontainers/go-digest"
9+
digest "github.com/opencontainers/go-digest"
1010
"github.com/pkg/errors"
1111
"github.com/tonistiigi/fsutil"
1212
)

client/image_build_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/docker/docker/api/types"
1414
"github.com/docker/docker/api/types/container"
1515
"github.com/docker/docker/errdefs"
16-
"github.com/docker/go-units"
16+
units "github.com/docker/go-units"
1717
)
1818

1919
func TestImageBuildError(t *testing.T) {

client/service_create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/docker/distribution/reference"
1010
"github.com/docker/docker/api/types"
1111
"github.com/docker/docker/api/types/swarm"
12-
"github.com/opencontainers/go-digest"
12+
digest "github.com/opencontainers/go-digest"
1313
"github.com/pkg/errors"
1414
)
1515

0 commit comments

Comments
 (0)