I think this was there for historic reasons (may have been goimports expected
this, and we used to have a linter that wanted it), but it's not needed, so
let's remove it (to make my IDE less complaining about unneeded aliases).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| ... | ... |
@@ -37,7 +37,7 @@ import ( |
| 37 | 37 |
"github.com/moby/buildkit/util/leaseutil" |
| 38 | 38 |
"github.com/moby/buildkit/util/progress" |
| 39 | 39 |
"github.com/moby/buildkit/util/resolver" |
| 40 |
- digest "github.com/opencontainers/go-digest" |
|
| 40 |
+ "github.com/opencontainers/go-digest" |
|
| 41 | 41 |
"github.com/opencontainers/image-spec/identity" |
| 42 | 42 |
ocispec "github.com/opencontainers/image-spec/specs-go/v1" |
| 43 | 43 |
"github.com/pkg/errors" |
| ... | ... |
@@ -17,7 +17,7 @@ import ( |
| 17 | 17 |
"github.com/moby/buildkit/session" |
| 18 | 18 |
"github.com/moby/buildkit/solver" |
| 19 | 19 |
"github.com/moby/buildkit/worker" |
| 20 |
- digest "github.com/opencontainers/go-digest" |
|
| 20 |
+ "github.com/opencontainers/go-digest" |
|
| 21 | 21 |
specs "github.com/opencontainers/image-spec/specs-go/v1" |
| 22 | 22 |
"github.com/pkg/errors" |
| 23 | 23 |
) |
| ... | ... |
@@ -15,7 +15,7 @@ import ( |
| 15 | 15 |
"github.com/docker/docker/pkg/idtools" |
| 16 | 16 |
"github.com/moby/buildkit/identity" |
| 17 | 17 |
"github.com/moby/buildkit/snapshot" |
| 18 |
- digest "github.com/opencontainers/go-digest" |
|
| 18 |
+ "github.com/opencontainers/go-digest" |
|
| 19 | 19 |
"github.com/pkg/errors" |
| 20 | 20 |
bolt "go.etcd.io/bbolt" |
| 21 | 21 |
) |
| ... | ... |
@@ -12,7 +12,7 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/reference" |
| 13 | 13 |
"github.com/moby/buildkit/exporter" |
| 14 | 14 |
"github.com/moby/buildkit/exporter/containerimage/exptypes" |
| 15 |
- digest "github.com/opencontainers/go-digest" |
|
| 15 |
+ "github.com/opencontainers/go-digest" |
|
| 16 | 16 |
"github.com/pkg/errors" |
| 17 | 17 |
"github.com/sirupsen/logrus" |
| 18 | 18 |
) |
| ... | ... |
@@ -9,7 +9,7 @@ import ( |
| 9 | 9 |
"github.com/moby/buildkit/cache" |
| 10 | 10 |
"github.com/moby/buildkit/util/progress" |
| 11 | 11 |
"github.com/moby/buildkit/util/system" |
| 12 |
- digest "github.com/opencontainers/go-digest" |
|
| 12 |
+ "github.com/opencontainers/go-digest" |
|
| 13 | 13 |
ocispec "github.com/opencontainers/image-spec/specs-go/v1" |
| 14 | 14 |
"github.com/pkg/errors" |
| 15 | 15 |
"github.com/sirupsen/logrus" |
| ... | ... |
@@ -6,7 +6,7 @@ import ( |
| 6 | 6 |
"github.com/docker/docker/image" |
| 7 | 7 |
"github.com/docker/docker/layer" |
| 8 | 8 |
"github.com/moby/buildkit/cache" |
| 9 |
- digest "github.com/opencontainers/go-digest" |
|
| 9 |
+ "github.com/opencontainers/go-digest" |
|
| 10 | 10 |
) |
| 11 | 11 |
|
| 12 | 12 |
// LayerGetter abstracts away the snapshotter |
| ... | ... |
@@ -41,7 +41,7 @@ import ( |
| 41 | 41 |
"github.com/moby/buildkit/util/compression" |
| 42 | 42 |
"github.com/moby/buildkit/util/contentutil" |
| 43 | 43 |
"github.com/moby/buildkit/util/progress" |
| 44 |
- digest "github.com/opencontainers/go-digest" |
|
| 44 |
+ "github.com/opencontainers/go-digest" |
|
| 45 | 45 |
ocispec "github.com/opencontainers/image-spec/specs-go/v1" |
| 46 | 46 |
"github.com/pkg/errors" |
| 47 | 47 |
"github.com/sirupsen/logrus" |
| ... | ... |
@@ -6,7 +6,7 @@ import ( |
| 6 | 6 |
|
| 7 | 7 |
"github.com/docker/docker/pkg/containerfs" |
| 8 | 8 |
iradix "github.com/hashicorp/go-immutable-radix" |
| 9 |
- digest "github.com/opencontainers/go-digest" |
|
| 9 |
+ "github.com/opencontainers/go-digest" |
|
| 10 | 10 |
"github.com/pkg/errors" |
| 11 | 11 |
"github.com/tonistiigi/fsutil" |
| 12 | 12 |
) |
| ... | ... |
@@ -9,7 +9,7 @@ import ( |
| 9 | 9 |
"github.com/docker/distribution/reference" |
| 10 | 10 |
"github.com/docker/docker/api/types" |
| 11 | 11 |
"github.com/docker/docker/api/types/swarm" |
| 12 |
- digest "github.com/opencontainers/go-digest" |
|
| 12 |
+ "github.com/opencontainers/go-digest" |
|
| 13 | 13 |
"github.com/pkg/errors" |
| 14 | 14 |
) |
| 15 | 15 |
|
| ... | ... |
@@ -14,7 +14,7 @@ import ( |
| 14 | 14 |
registrytypes "github.com/docker/docker/api/types/registry" |
| 15 | 15 |
"github.com/docker/docker/api/types/swarm" |
| 16 | 16 |
"github.com/docker/docker/errdefs" |
| 17 |
- digest "github.com/opencontainers/go-digest" |
|
| 17 |
+ "github.com/opencontainers/go-digest" |
|
| 18 | 18 |
v1 "github.com/opencontainers/image-spec/specs-go/v1" |
| 19 | 19 |
"gotest.tools/v3/assert" |
| 20 | 20 |
is "gotest.tools/v3/assert/cmp" |
| ... | ... |
@@ -26,7 +26,7 @@ import ( |
| 26 | 26 |
"github.com/docker/swarmkit/api" |
| 27 | 27 |
"github.com/docker/swarmkit/log" |
| 28 | 28 |
gogotypes "github.com/gogo/protobuf/types" |
| 29 |
- digest "github.com/opencontainers/go-digest" |
|
| 29 |
+ "github.com/opencontainers/go-digest" |
|
| 30 | 30 |
"github.com/pkg/errors" |
| 31 | 31 |
"github.com/sirupsen/logrus" |
| 32 | 32 |
"golang.org/x/time/rate" |
| ... | ... |
@@ -14,7 +14,7 @@ import ( |
| 14 | 14 |
"github.com/docker/distribution/reference" |
| 15 | 15 |
"github.com/docker/docker/errdefs" |
| 16 | 16 |
"github.com/docker/docker/image" |
| 17 |
- digest "github.com/opencontainers/go-digest" |
|
| 17 |
+ "github.com/opencontainers/go-digest" |
|
| 18 | 18 |
specs "github.com/opencontainers/image-spec/specs-go/v1" |
| 19 | 19 |
"github.com/pkg/errors" |
| 20 | 20 |
"github.com/sirupsen/logrus" |
| ... | ... |
@@ -15,7 +15,7 @@ import ( |
| 15 | 15 |
"github.com/docker/docker/errdefs" |
| 16 | 16 |
"github.com/docker/docker/image" |
| 17 | 17 |
"github.com/docker/docker/layer" |
| 18 |
- digest "github.com/opencontainers/go-digest" |
|
| 18 |
+ "github.com/opencontainers/go-digest" |
|
| 19 | 19 |
"github.com/pkg/errors" |
| 20 | 20 |
"github.com/sirupsen/logrus" |
| 21 | 21 |
) |
| ... | ... |
@@ -16,7 +16,7 @@ import ( |
| 16 | 16 |
"github.com/docker/docker/errdefs" |
| 17 | 17 |
"github.com/docker/docker/pkg/progress" |
| 18 | 18 |
"github.com/docker/docker/pkg/streamformatter" |
| 19 |
- digest "github.com/opencontainers/go-digest" |
|
| 19 |
+ "github.com/opencontainers/go-digest" |
|
| 20 | 20 |
specs "github.com/opencontainers/image-spec/specs-go/v1" |
| 21 | 21 |
"github.com/pkg/errors" |
| 22 | 22 |
"github.com/sirupsen/logrus" |
| ... | ... |
@@ -18,7 +18,7 @@ import ( |
| 18 | 18 |
dockerreference "github.com/docker/docker/reference" |
| 19 | 19 |
"github.com/docker/docker/registry" |
| 20 | 20 |
"github.com/docker/libtrust" |
| 21 |
- digest "github.com/opencontainers/go-digest" |
|
| 21 |
+ "github.com/opencontainers/go-digest" |
|
| 22 | 22 |
"github.com/pkg/errors" |
| 23 | 23 |
"github.com/sirupsen/logrus" |
| 24 | 24 |
"golang.org/x/sync/singleflight" |
| ... | ... |
@@ -12,7 +12,7 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/distribution" |
| 13 | 13 |
"github.com/docker/docker/image" |
| 14 | 14 |
"github.com/docker/docker/layer" |
| 15 |
- digest "github.com/opencontainers/go-digest" |
|
| 15 |
+ "github.com/opencontainers/go-digest" |
|
| 16 | 16 |
"github.com/pkg/errors" |
| 17 | 17 |
"github.com/sirupsen/logrus" |
| 18 | 18 |
) |
| ... | ... |
@@ -13,7 +13,7 @@ import ( |
| 13 | 13 |
"github.com/containerd/containerd/metadata" |
| 14 | 14 |
"github.com/containerd/containerd/namespaces" |
| 15 | 15 |
"github.com/docker/docker/image" |
| 16 |
- digest "github.com/opencontainers/go-digest" |
|
| 16 |
+ "github.com/opencontainers/go-digest" |
|
| 17 | 17 |
v1 "github.com/opencontainers/image-spec/specs-go/v1" |
| 18 | 18 |
"go.etcd.io/bbolt" |
| 19 | 19 |
"gotest.tools/v3/assert" |
| ... | ... |
@@ -11,7 +11,7 @@ import ( |
| 11 | 11 |
"github.com/docker/docker/container" |
| 12 | 12 |
"github.com/docker/docker/image" |
| 13 | 13 |
"github.com/google/uuid" |
| 14 |
- digest "github.com/opencontainers/go-digest" |
|
| 14 |
+ "github.com/opencontainers/go-digest" |
|
| 15 | 15 |
"gotest.tools/v3/assert" |
| 16 | 16 |
is "gotest.tools/v3/assert/cmp" |
| 17 | 17 |
) |
| ... | ... |
@@ -18,7 +18,7 @@ import ( |
| 18 | 18 |
refstore "github.com/docker/docker/reference" |
| 19 | 19 |
"github.com/docker/docker/registry" |
| 20 | 20 |
"github.com/docker/libtrust" |
| 21 |
- digest "github.com/opencontainers/go-digest" |
|
| 21 |
+ "github.com/opencontainers/go-digest" |
|
| 22 | 22 |
specs "github.com/opencontainers/image-spec/specs-go/v1" |
| 23 | 23 |
"github.com/pkg/errors" |
| 24 | 24 |
) |
| ... | ... |
@@ -14,7 +14,7 @@ import ( |
| 14 | 14 |
"github.com/docker/distribution/manifest/manifestlist" |
| 15 | 15 |
"github.com/docker/distribution/manifest/schema1" |
| 16 | 16 |
"github.com/docker/distribution/manifest/schema2" |
| 17 |
- digest "github.com/opencontainers/go-digest" |
|
| 17 |
+ "github.com/opencontainers/go-digest" |
|
| 18 | 18 |
specs "github.com/opencontainers/image-spec/specs-go/v1" |
| 19 | 19 |
"github.com/pkg/errors" |
| 20 | 20 |
) |
| ... | ... |
@@ -18,7 +18,7 @@ import ( |
| 18 | 18 |
"github.com/docker/distribution/manifest/schema1" |
| 19 | 19 |
"github.com/docker/distribution/manifest/schema2" |
| 20 | 20 |
"github.com/google/go-cmp/cmp/cmpopts" |
| 21 |
- digest "github.com/opencontainers/go-digest" |
|
| 21 |
+ "github.com/opencontainers/go-digest" |
|
| 22 | 22 |
specs "github.com/opencontainers/image-spec/specs-go/v1" |
| 23 | 23 |
"github.com/pkg/errors" |
| 24 | 24 |
"gotest.tools/v3/assert" |
| ... | ... |
@@ -10,7 +10,7 @@ import ( |
| 10 | 10 |
"github.com/docker/docker/pkg/progress" |
| 11 | 11 |
refstore "github.com/docker/docker/reference" |
| 12 | 12 |
"github.com/docker/docker/registry" |
| 13 |
- digest "github.com/opencontainers/go-digest" |
|
| 13 |
+ "github.com/opencontainers/go-digest" |
|
| 14 | 14 |
"github.com/pkg/errors" |
| 15 | 15 |
"github.com/sirupsen/logrus" |
| 16 | 16 |
) |
| ... | ... |
@@ -28,7 +28,7 @@ import ( |
| 28 | 28 |
"github.com/docker/docker/pkg/system" |
| 29 | 29 |
refstore "github.com/docker/docker/reference" |
| 30 | 30 |
"github.com/docker/docker/registry" |
| 31 |
- digest "github.com/opencontainers/go-digest" |
|
| 31 |
+ "github.com/opencontainers/go-digest" |
|
| 32 | 32 |
specs "github.com/opencontainers/image-spec/specs-go/v1" |
| 33 | 33 |
"github.com/pkg/errors" |
| 34 | 34 |
"github.com/sirupsen/logrus" |
| ... | ... |
@@ -12,7 +12,7 @@ import ( |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/distribution/manifest/schema1" |
| 14 | 14 |
"github.com/docker/distribution/reference" |
| 15 |
- digest "github.com/opencontainers/go-digest" |
|
| 15 |
+ "github.com/opencontainers/go-digest" |
|
| 16 | 16 |
specs "github.com/opencontainers/image-spec/specs-go/v1" |
| 17 | 17 |
"gotest.tools/v3/assert" |
| 18 | 18 |
is "gotest.tools/v3/assert/cmp" |
| ... | ... |
@@ -24,7 +24,7 @@ import ( |
| 24 | 24 |
"github.com/docker/docker/pkg/progress" |
| 25 | 25 |
"github.com/docker/docker/pkg/stringid" |
| 26 | 26 |
"github.com/docker/docker/registry" |
| 27 |
- digest "github.com/opencontainers/go-digest" |
|
| 27 |
+ "github.com/opencontainers/go-digest" |
|
| 28 | 28 |
"github.com/pkg/errors" |
| 29 | 29 |
"github.com/sirupsen/logrus" |
| 30 | 30 |
) |
| ... | ... |
@@ -17,7 +17,7 @@ import ( |
| 17 | 17 |
"github.com/docker/docker/pkg/progress" |
| 18 | 18 |
refstore "github.com/docker/docker/reference" |
| 19 | 19 |
"github.com/docker/docker/registry" |
| 20 |
- digest "github.com/opencontainers/go-digest" |
|
| 20 |
+ "github.com/opencontainers/go-digest" |
|
| 21 | 21 |
) |
| 22 | 22 |
|
| 23 | 23 |
func TestGetRepositoryMountCandidates(t *testing.T) {
|
| ... | ... |
@@ -12,7 +12,7 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/api/types/container" |
| 13 | 13 |
"github.com/docker/docker/dockerversion" |
| 14 | 14 |
"github.com/docker/docker/layer" |
| 15 |
- digest "github.com/opencontainers/go-digest" |
|
| 15 |
+ "github.com/opencontainers/go-digest" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
// ID is the content-addressable ID of an image. |
| ... | ... |
@@ -8,7 +8,7 @@ import ( |
| 8 | 8 |
"github.com/docker/distribution/digestset" |
| 9 | 9 |
"github.com/docker/docker/layer" |
| 10 | 10 |
"github.com/docker/docker/pkg/system" |
| 11 |
- digest "github.com/opencontainers/go-digest" |
|
| 11 |
+ "github.com/opencontainers/go-digest" |
|
| 12 | 12 |
"github.com/pkg/errors" |
| 13 | 13 |
"github.com/sirupsen/logrus" |
| 14 | 14 |
) |
| ... | ... |
@@ -21,7 +21,7 @@ import ( |
| 21 | 21 |
"github.com/docker/docker/pkg/stringid" |
| 22 | 22 |
"github.com/docker/docker/pkg/system" |
| 23 | 23 |
"github.com/moby/sys/symlink" |
| 24 |
- digest "github.com/opencontainers/go-digest" |
|
| 24 |
+ "github.com/opencontainers/go-digest" |
|
| 25 | 25 |
"github.com/sirupsen/logrus" |
| 26 | 26 |
) |
| 27 | 27 |
|
| ... | ... |
@@ -25,7 +25,7 @@ import ( |
| 25 | 25 |
"github.com/docker/docker/testutil/fakegit" |
| 26 | 26 |
"github.com/docker/docker/testutil/fakestorage" |
| 27 | 27 |
"github.com/moby/buildkit/frontend/dockerfile/command" |
| 28 |
- digest "github.com/opencontainers/go-digest" |
|
| 28 |
+ "github.com/opencontainers/go-digest" |
|
| 29 | 29 |
"gotest.tools/v3/assert" |
| 30 | 30 |
"gotest.tools/v3/assert/cmp" |
| 31 | 31 |
"gotest.tools/v3/icmd" |
| ... | ... |
@@ -14,7 +14,7 @@ import ( |
| 14 | 14 |
"github.com/docker/docker/api/types" |
| 15 | 15 |
"github.com/docker/docker/integration-cli/cli" |
| 16 | 16 |
"github.com/docker/docker/integration-cli/cli/build" |
| 17 |
- digest "github.com/opencontainers/go-digest" |
|
| 17 |
+ "github.com/opencontainers/go-digest" |
|
| 18 | 18 |
"gotest.tools/v3/assert" |
| 19 | 19 |
is "gotest.tools/v3/assert/cmp" |
| 20 | 20 |
) |
| ... | ... |
@@ -14,7 +14,7 @@ import ( |
| 14 | 14 |
"github.com/docker/distribution/manifest/manifestlist" |
| 15 | 15 |
"github.com/docker/distribution/manifest/schema2" |
| 16 | 16 |
"github.com/docker/docker/integration-cli/cli/build" |
| 17 |
- digest "github.com/opencontainers/go-digest" |
|
| 17 |
+ "github.com/opencontainers/go-digest" |
|
| 18 | 18 |
"gotest.tools/v3/assert" |
| 19 | 19 |
"gotest.tools/v3/icmd" |
| 20 | 20 |
) |
| ... | ... |
@@ -16,7 +16,7 @@ import ( |
| 16 | 16 |
"time" |
| 17 | 17 |
|
| 18 | 18 |
"github.com/docker/docker/integration-cli/cli/build" |
| 19 |
- digest "github.com/opencontainers/go-digest" |
|
| 19 |
+ "github.com/opencontainers/go-digest" |
|
| 20 | 20 |
"gotest.tools/v3/assert" |
| 21 | 21 |
is "gotest.tools/v3/assert/cmp" |
| 22 | 22 |
"gotest.tools/v3/icmd" |
| ... | ... |
@@ -16,7 +16,7 @@ import ( |
| 16 | 16 |
"github.com/docker/distribution" |
| 17 | 17 |
"github.com/docker/docker/pkg/archive" |
| 18 | 18 |
"github.com/docker/docker/pkg/containerfs" |
| 19 |
- digest "github.com/opencontainers/go-digest" |
|
| 19 |
+ "github.com/opencontainers/go-digest" |
|
| 20 | 20 |
"github.com/sirupsen/logrus" |
| 21 | 21 |
) |
| 22 | 22 |
|
| ... | ... |
@@ -15,7 +15,7 @@ import ( |
| 15 | 15 |
"github.com/docker/docker/pkg/stringid" |
| 16 | 16 |
"github.com/docker/docker/pkg/system" |
| 17 | 17 |
"github.com/moby/locker" |
| 18 |
- digest "github.com/opencontainers/go-digest" |
|
| 18 |
+ "github.com/opencontainers/go-digest" |
|
| 19 | 19 |
"github.com/sirupsen/logrus" |
| 20 | 20 |
"github.com/vbatts/tar-split/tar/asm" |
| 21 | 21 |
"github.com/vbatts/tar-split/tar/storage" |
| ... | ... |
@@ -16,7 +16,7 @@ import ( |
| 16 | 16 |
"github.com/docker/docker/pkg/containerfs" |
| 17 | 17 |
"github.com/docker/docker/pkg/idtools" |
| 18 | 18 |
"github.com/docker/docker/pkg/stringid" |
| 19 |
- digest "github.com/opencontainers/go-digest" |
|
| 19 |
+ "github.com/opencontainers/go-digest" |
|
| 20 | 20 |
) |
| 21 | 21 |
|
| 22 | 22 |
func init() {
|
| ... | ... |
@@ -33,7 +33,7 @@ import ( |
| 33 | 33 |
"github.com/docker/docker/pkg/stringid" |
| 34 | 34 |
v2 "github.com/docker/docker/plugin/v2" |
| 35 | 35 |
"github.com/moby/sys/mount" |
| 36 |
- digest "github.com/opencontainers/go-digest" |
|
| 36 |
+ "github.com/opencontainers/go-digest" |
|
| 37 | 37 |
specs "github.com/opencontainers/image-spec/specs-go/v1" |
| 38 | 38 |
"github.com/pkg/errors" |
| 39 | 39 |
"github.com/sirupsen/logrus" |
| ... | ... |
@@ -18,7 +18,7 @@ import ( |
| 18 | 18 |
"github.com/docker/docker/pkg/ioutils" |
| 19 | 19 |
"github.com/docker/docker/pkg/progress" |
| 20 | 20 |
"github.com/docker/docker/pkg/stringid" |
| 21 |
- digest "github.com/opencontainers/go-digest" |
|
| 21 |
+ "github.com/opencontainers/go-digest" |
|
| 22 | 22 |
specs "github.com/opencontainers/image-spec/specs-go/v1" |
| 23 | 23 |
"github.com/pkg/errors" |
| 24 | 24 |
"github.com/sirupsen/logrus" |
| ... | ... |
@@ -22,7 +22,7 @@ import ( |
| 22 | 22 |
"github.com/docker/docker/pkg/pubsub" |
| 23 | 23 |
v2 "github.com/docker/docker/plugin/v2" |
| 24 | 24 |
"github.com/docker/docker/registry" |
| 25 |
- digest "github.com/opencontainers/go-digest" |
|
| 25 |
+ "github.com/opencontainers/go-digest" |
|
| 26 | 26 |
specs "github.com/opencontainers/runtime-spec/specs-go" |
| 27 | 27 |
"github.com/pkg/errors" |
| 28 | 28 |
"github.com/sirupsen/logrus" |
| ... | ... |
@@ -18,7 +18,7 @@ import ( |
| 18 | 18 |
"github.com/docker/docker/pkg/stringid" |
| 19 | 19 |
v2 "github.com/docker/docker/plugin/v2" |
| 20 | 20 |
"github.com/moby/sys/mount" |
| 21 |
- digest "github.com/opencontainers/go-digest" |
|
| 21 |
+ "github.com/opencontainers/go-digest" |
|
| 22 | 22 |
specs "github.com/opencontainers/image-spec/specs-go/v1" |
| 23 | 23 |
"github.com/pkg/errors" |
| 24 | 24 |
"github.com/sirupsen/logrus" |
| ... | ... |
@@ -11,7 +11,7 @@ import ( |
| 11 | 11 |
"github.com/docker/docker/api/types" |
| 12 | 12 |
"github.com/docker/docker/pkg/plugingetter" |
| 13 | 13 |
"github.com/docker/docker/pkg/plugins" |
| 14 |
- digest "github.com/opencontainers/go-digest" |
|
| 14 |
+ "github.com/opencontainers/go-digest" |
|
| 15 | 15 |
specs "github.com/opencontainers/runtime-spec/specs-go" |
| 16 | 16 |
) |
| 17 | 17 |
|