Skip to content

Commit adf1973

Browse files
committed
always pass 'nil' platform to ContainerCreate
1 parent 9e9c0a6 commit adf1973

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

agent/dockerclient/dockerapi/docker_client.go

+9-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import (
5353
"github.com/docker/docker/api/types/filters"
5454
"github.com/docker/docker/api/types/network"
5555
"github.com/docker/docker/api/types/volume"
56-
v1 "github.com/opencontainers/image-spec/specs-go/v1"
56+
//v1 "github.com/opencontainers/image-spec/specs-go/v1"
5757
)
5858

5959
const (
@@ -575,7 +575,14 @@ func (dg *dockerGoClient) createContainer(ctx context.Context,
575575
return DockerContainerMetadata{Error: CannotGetDockerClientError{version: dg.version, err: err}}
576576
}
577577

578-
dockerContainer, err := client.ContainerCreate(ctx, config, hostConfig, &network.NetworkingConfig{}, &v1.Platform{}, name)
578+
// platform := &v1.Platform{}
579+
// if version, err := dg.APIVersion(); err == nil {
580+
// if dockerclient.Version_1_41.IsGreaterThan(version) {
581+
// // don't set platform struct for docker API versions less than 1.41
582+
// platform = nil
583+
// }
584+
// }
585+
dockerContainer, err := client.ContainerCreate(ctx, config, hostConfig, &network.NetworkingConfig{}, nil, name)
579586
if err != nil {
580587
return DockerContainerMetadata{Error: CannotCreateContainerError{err}}
581588
}

0 commit comments

Comments
 (0)