This repository has been archived by the owner on Feb 1, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Updating ContainerConfig to use engine-api #1983
Merged
vieux
merged 15 commits into
docker-archive:master
from
nishanttotla:container-config-engine-api
Apr 14, 2016
Merged
Updating ContainerConfig to use engine-api #1983
vieux
merged 15 commits into
docker-archive:master
from
nishanttotla:container-config-engine-api
Apr 14, 2016
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 tasks
This was the first thing I hit, and I just nope'd out of there into easier territory. I had something similar to your updated |
@MHBauer That sounds like my experience 😺. I think this change is the single major one that will take the longest to get right, the rest will either depend on it, or are more isolated. The difficulty here is that it affects a large part of the code, so I'm facing merge conflicts all the time! |
6c2ca36
to
46bc92c
Compare
c069eec
to
62af821
Compare
This PR is currently blocked by docker/engine-api#171 |
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
response Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
17cc085
to
8d99298
Compare
LGTM |
1 similar comment
LGTM |
This was referenced Apr 14, 2016
Wow, I didn't realize this was completed. Nice job! |
@MHBauer thanks! Not much more left now! |
ChristianKniep
pushed a commit
to ChristianKniep/swarm
that referenced
this pull request
Jul 27, 2017
…nfig-engine-api Updating ContainerConfig to use engine-api
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is work in progress, PR is meant for review
This is the first change that will truly affect the entire repo AND the users, and will need discussion as some old API conventions might have to be deprecated.
The important decision here is the change in
ContainerConfig
struct insideconfig.go
. Initially,ContainerConfig
looked likebut now it looks like
where
container
andnetwork
are packages inengine-api/types
. This is keeping in line with the recent Docker API changes whereHostConfig
andNetworkingConfig
was moved out ofContainerConfig
(renamed asConfig
) to be independent."This change is too big"
I'm afraid so, but there's no other way to do it, all of this change needs to happen at once. Three function calls have been moved over to use
engine-api
, namelyContainerCreate
,ContainerInspect
, andContainerList
, along with the relevant changes needed to make these work."How do I review this?"
Fortunately, many changes can be classified as "plumbing", so the root changes are fairly small. Start with
cluster/config.go
andcluster/container.go
to see how structs have changed. Then check outcluster/engine.go
where all the real stuff is happening, and scan through the calls being made to ensure that it all makes sense. Note: We don't have an embeddedHostConfig
insideConfig
anymore, they're separate, so we don't have to copy data over each time.Finally, please do pull this branch and test locally, to make sure that it actually works.
This PR is part of a series to implement #1879.
Signed-off-by: Nishant Totla nishanttotla@gmail.com