Skip to content

Commit 7eaae97

Browse files
thaJeztahthaJeztah
committed
cli/command/container: use consistent alias for oci-spec
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 77fbbc3 commit 7eaae97

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎cli/command/container/client_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/docker/docker/api/types/network"
1212
"github.com/docker/docker/api/types/system"
1313
"github.com/docker/docker/client"
14-
specs "github.com/opencontainers/image-spec/specs-go/v1"
14+
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
1515
)
1616

1717
type fakeClient struct {
@@ -22,7 +22,7 @@ type fakeClient struct {
2222
createContainerFunc func(config *container.Config,
2323
hostConfig *container.HostConfig,
2424
networkingConfig *network.NetworkingConfig,
25-
platform *specs.Platform,
25+
platform *ocispec.Platform,
2626
containerName string) (container.CreateResponse, error)
2727
containerStartFunc func(containerID string, options container.StartOptions) error
2828
imageCreateFunc func(ctx context.Context, parentReference string, options image.CreateOptions) (io.ReadCloser, error)
@@ -84,7 +84,7 @@ func (f *fakeClient) ContainerCreate(
8484
config *container.Config,
8585
hostConfig *container.HostConfig,
8686
networkingConfig *network.NetworkingConfig,
87-
platform *specs.Platform,
87+
platform *ocispec.Platform,
8888
containerName string,
8989
) (container.CreateResponse, error) {
9090
if f.createContainerFunc != nil {

‎cli/command/container/create.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/docker/docker/api/types/versions"
3030
"github.com/docker/docker/client"
3131
"github.com/docker/docker/errdefs"
32-
specs "github.com/opencontainers/image-spec/specs-go/v1"
32+
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
3333
"github.com/pkg/errors"
3434
"github.com/spf13/cobra"
3535
"github.com/spf13/pflag"
@@ -308,7 +308,7 @@ func createContainer(ctx context.Context, dockerCli command.Cli, containerCfg *c
308308
}
309309
}
310310

311-
var platform *specs.Platform
311+
var platform *ocispec.Platform
312312
// Engine API version 1.41 first introduced the option to specify platform on
313313
// create. It will produce an error if you try to set a platform on older API
314314
// versions, so check the API version here to maintain backwards

‎cli/command/container/create_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/docker/docker/api/types/network"
2020
"github.com/docker/docker/api/types/system"
2121
"github.com/google/go-cmp/cmp"
22-
specs "github.com/opencontainers/image-spec/specs-go/v1"
22+
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
2323
"github.com/spf13/pflag"
2424
"gotest.tools/v3/assert"
2525
is "gotest.tools/v3/assert/cmp"
@@ -121,7 +121,7 @@ func TestCreateContainerImagePullPolicy(t *testing.T) {
121121
config *container.Config,
122122
hostConfig *container.HostConfig,
123123
networkingConfig *network.NetworkingConfig,
124-
platform *specs.Platform,
124+
platform *ocispec.Platform,
125125
containerName string,
126126
) (container.CreateResponse, error) {
127127
defer func() { tc.ResponseCounter++ }()
@@ -253,7 +253,7 @@ func TestNewCreateCommandWithContentTrustErrors(t *testing.T) {
253253
createContainerFunc: func(config *container.Config,
254254
hostConfig *container.HostConfig,
255255
networkingConfig *network.NetworkingConfig,
256-
platform *specs.Platform,
256+
platform *ocispec.Platform,
257257
containerName string,
258258
) (container.CreateResponse, error) {
259259
return container.CreateResponse{}, errors.New("shouldn't try to pull image")
@@ -308,7 +308,7 @@ func TestNewCreateCommandWithWarnings(t *testing.T) {
308308
createContainerFunc: func(config *container.Config,
309309
hostConfig *container.HostConfig,
310310
networkingConfig *network.NetworkingConfig,
311-
platform *specs.Platform,
311+
platform *ocispec.Platform,
312312
containerName string,
313313
) (container.CreateResponse, error) {
314314
return container.CreateResponse{Warnings: tc.warnings}, nil
@@ -347,7 +347,7 @@ func TestCreateContainerWithProxyConfig(t *testing.T) {
347347
createContainerFunc: func(config *container.Config,
348348
hostConfig *container.HostConfig,
349349
networkingConfig *network.NetworkingConfig,
350-
platform *specs.Platform,
350+
platform *ocispec.Platform,
351351
containerName string,
352352
) (container.CreateResponse, error) {
353353
sort.Strings(config.Env)

‎cli/command/container/run_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/docker/docker/api/types/image"
2222
"github.com/docker/docker/api/types/network"
2323
"github.com/docker/docker/pkg/jsonmessage"
24-
specs "github.com/opencontainers/image-spec/specs-go/v1"
24+
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
2525
"github.com/spf13/pflag"
2626
"gotest.tools/v3/assert"
2727
is "gotest.tools/v3/assert/cmp"
@@ -57,7 +57,7 @@ func TestRunValidateFlags(t *testing.T) {
5757

5858
func TestRunLabel(t *testing.T) {
5959
fakeCLI := test.NewFakeCli(&fakeClient{
60-
createContainerFunc: func(_ *container.Config, _ *container.HostConfig, _ *network.NetworkingConfig, _ *specs.Platform, _ string) (container.CreateResponse, error) {
60+
createContainerFunc: func(_ *container.Config, _ *container.HostConfig, _ *network.NetworkingConfig, _ *ocispec.Platform, _ string) (container.CreateResponse, error) {
6161
return container.CreateResponse{
6262
ID: "id",
6363
}, nil
@@ -80,7 +80,7 @@ func TestRunAttach(t *testing.T) {
8080
var conn net.Conn
8181
attachCh := make(chan struct{})
8282
fakeCLI := test.NewFakeCli(&fakeClient{
83-
createContainerFunc: func(_ *container.Config, _ *container.HostConfig, _ *network.NetworkingConfig, _ *specs.Platform, _ string) (container.CreateResponse, error) {
83+
createContainerFunc: func(_ *container.Config, _ *container.HostConfig, _ *network.NetworkingConfig, _ *ocispec.Platform, _ string) (container.CreateResponse, error) {
8484
return container.CreateResponse{
8585
ID: "id",
8686
}, nil
@@ -151,7 +151,7 @@ func TestRunAttachTermination(t *testing.T) {
151151
killCh := make(chan struct{})
152152
attachCh := make(chan struct{})
153153
fakeCLI := test.NewFakeCli(&fakeClient{
154-
createContainerFunc: func(_ *container.Config, _ *container.HostConfig, _ *network.NetworkingConfig, _ *specs.Platform, _ string) (container.CreateResponse, error) {
154+
createContainerFunc: func(_ *container.Config, _ *container.HostConfig, _ *network.NetworkingConfig, _ *ocispec.Platform, _ string) (container.CreateResponse, error) {
155155
return container.CreateResponse{
156156
ID: "id",
157157
}, nil
@@ -229,7 +229,7 @@ func TestRunPullTermination(t *testing.T) {
229229
attachCh := make(chan struct{})
230230
fakeCLI := test.NewFakeCli(&fakeClient{
231231
createContainerFunc: func(config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig,
232-
platform *specs.Platform, containerName string,
232+
platform *ocispec.Platform, containerName string,
233233
) (container.CreateResponse, error) {
234234
return container.CreateResponse{}, errors.New("shouldn't try to create a container")
235235
},
@@ -332,7 +332,7 @@ func TestRunCommandWithContentTrustErrors(t *testing.T) {
332332
createContainerFunc: func(config *container.Config,
333333
hostConfig *container.HostConfig,
334334
networkingConfig *network.NetworkingConfig,
335-
platform *specs.Platform,
335+
platform *ocispec.Platform,
336336
containerName string,
337337
) (container.CreateResponse, error) {
338338
return container.CreateResponse{}, errors.New("shouldn't try to pull image")

0 commit comments

Comments
 (0)