Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging moby branch into dev for docker SDK migration #1743

Merged
merged 73 commits into from
Dec 14, 2018
Merged

Conversation

yhlee-aws
Copy link
Contributor

@yhlee-aws yhlee-aws commented Dec 13, 2018

Summary

Merging Docker SDK migration branch into dev

Implementation details

Replacing go-dockerclient 3rd party package with docker vended SDK.

Testing

All code changes have unit/integ/fnl tests updated

  • Builds on Linux (make release)
  • Builds on Windows (go build -out amazon-ecs-agent.exe ./agent)
  • Unit tests on Linux (make test) pass
  • Unit tests on Windows (go test -timeout=25s ./agent/...) pass
  • Integration tests on Linux (make run-integ-tests) pass
  • Integration tests on Windows (.\scripts\run-integ-tests.ps1) pass
  • Functional tests on Linux (make run-functional-tests) pass
  • Functional tests on Windows (.\scripts\run-functional-tests.ps1) pass

New tests cover the changes: yes

Description for the changelog

Licensing

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

voorka added 30 commits July 10, 2018 17:29
Vendored packages for new moby clients

generated new mocks for interface.

minor refactor

minor refactor

minor refactor
Adding interface package for Docker SDK clients
Docker SDK Client factory setup
dockerapi: Support for Docker SDK Client
dockerapi: Refactored Docker Client Testing
dockerapi: Migrated VolumeCreate and VolumeInspect to Docker SDK
dockerapi: Migrated VolumeRemove and APIVersion to Docker SDK
dockerapi: Migrated StopContainer to DockerSDK
dockerapi: Migrated ContainerList to Docker SDK
dockerapi: Migrated ContainerRemove to Docker SDK
dockerapi: Migrated ContainerStart to Docker SDK
dockerapi: Migrated RemoveImage to Docker SDK
dockerapi: Migrated VersionWithContext to Docker SDK
yhlee-aws and others added 15 commits October 21, 2018 22:51
Merge branch 'dev' into moby
1) Our sdk migration used apis newer than the latest docker release, so
our best choice is to rely on the master branch.

2) We needed newer versions of some other docker dependencies, such as
docker/distribution.

3) Ran dep ensure
This was broken in a bad swagger run.

See moby/moby@b16b125
Merge branch 'dev' into moby
 Merge branch 'dev' into moby
Merge branch 'dev' into moby
Merge branch 'dev' into moby
@yhlee-aws yhlee-aws requested a review from a team December 13, 2018 00:50
Copy link
Contributor

@linkar-ec2 linkar-ec2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚢

@yhlee-aws yhlee-aws requested review from petderek and a team December 13, 2018 20:19
@yhlee-aws yhlee-aws closed this Dec 13, 2018
@yhlee-aws yhlee-aws reopened this Dec 13, 2018
@yhlee-aws yhlee-aws merged commit 39c830f into aws:dev Dec 14, 2018
@yhlee-aws yhlee-aws added this to the 1.24.0 milestone Jan 2, 2019
@yumex93 yumex93 mentioned this pull request Jan 4, 2019
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants