Bump github.com/docker/docker from 20.10.24+incompatible to 24.0.6+incompatible in /agent and /ecs-agent

[mythri-garaga]

Summary

Currently the dependabot PR #3895 to update the docker version from 20.10.24+incompatible to 24.0.6+incompatible in /agent is blocked due to backward incompatible dependancy changes in github.com/docker/docker/api/types/container/ and github.com/docker/docker/api/types/volume/. This is causing the static check and linux unit test failures in the PR #3895. This change includes some refactoring to fix the compatabilty and also upgrading the docker version in /ecs-agent module to 24.0.6+incompatible to maintain the same docker versions in both /agent and /ecs-agent(See #3768).

Implementation details

1. Refactoring the type container.ContainerCreateCreatedBody to container.CreateResponse in

   • agent/dockerclient/sdkclient/interface.go
   • agent/dockerclient/dockerapi/docker_client_test.go
   • agent/dockerclient/sdkclient/mocks/sdkclient_mocks.go
   • agent/stats/common_test.go

2. Refactoring the type from volume.VolumeCreateBody to volume.CreateOptions in

   • agent/dockerclient/sdkclient/interface.go
   • agent/dockerclient/dockerapi/docker_client.go
   • agent/dockerclient/dockerapi/docker_client_test.go

3. Function signature of ContainerStop() in github.com/docker/docker/client changed from

   ContainerStop(ctx context.Context, containerID string, timeout *time.Duration) error
   

   to

   ContainerStop(ctx context.Context, containerID string, options container.StopOptions) error
   

   so updated the following files to reflect the change

   • agent/dockerclient/sdkclient/interface.go
   • agent/dockerclient/dockerapi/docker_client.go
   • agent/dockerclient/dockerapi/docker_client_test.go
   • agent/dockerclient/sdkclient/mocks/sdkclient_mocks.go
   • agent/stats/engine_integ_test.go
   • agent/stats/engine_unix_integ_test.go
   • agent/stats/engine_unix_integ_test.go

4. Updated package name from types to volume in few places as the file github.com/docker/docker/api/types/volume.go was moved to new /volume folder (github.com/docker/docker/api/types/volume/volume.go).

   • agent/api/task/task_test.go
   • agent/api/task/taskvolume_test.go
   • agent/dockerclient/dockerapi/docker_client_test.go
   • agent/dockerclient/dockerapi/types.go
   • agent/dockerclient/sdkclient/mocks/sdkclient_mocks.go
   • agent/dockerclient/sdkclient/mocks/sdkclient_mocks.go
   • agent/taskresource/volume/dockervolume_test.go

5. Scan() is now a member function of LocalRegistry - plugins: Move SpecPaths into LocalRegistry moby/moby#44789, updated the Scan() method in agent/utils/mobypkgwrapper/plugins.go based on these upstream changes.

Testing

New tests cover the changes: yes
Functional tests ran successfully on an AMI with an older docker version (19.03.13) and containerd version(1.4.13)

Description for the changelog

Enhancement: Update the docker version from 20.10.24+incompatible to 24.0.6+incompatible in /agent and /ecs-agent

Licensing

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.