DOCKER-458: Can't specify memory for containers with 1.7 client #43
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
Instead of getting the value Memory from just the root of the container object, which is where docker clients < 1.7 put it, we also check in container.HostConfig.Memory, which is where docker clients >= 1.7 put it. This commit adds integration tests for this change. These tests create docker containers with a memory value different than the default memory value and mimic the behavior of docker clients pre and post 1.7. This commit also moves loadConfigSync to its own module so that it can be used by tests that need to load the configuration to lookup default values (such as defaultMemory in this case).
misterdjules
force-pushed
the
fix-memory-docker-1-7
branch
from
4809097
to
378d07a
Compare
|
@joshwilsdon Updated the changes according to your code review, thank you :) |
|
I notice there's still MEMORY_IN_MBS while BYTES_IN_MBS was changed to BYTES_IN_MB, should we change MEMORY_IN_MBS too? Otherwise: LGTM |
|
@joshwilsdon I wrote |
misterdjules
pushed a commit
that referenced
this pull request
Jul 13, 2015
Instead of getting the value Memory from just the root of the container object, which is where docker clients < 1.7 put it, we also check in container.HostConfig.Memory, which is where docker clients >= 1.7 put it. This commit adds integration tests for this change. These tests create docker containers with a memory value different than the default memory value and mimic the behavior of docker clients pre and post 1.7. This commit also moves loadConfigSync to its own module so that it can be used by tests that need to load the configuration to lookup default values (such as defaultMemory in this case). PR: #43 PR-URL: #43 Reviewed-By: Josh Wilsdon <jwilsdon@joyent.com>
|
Landed in c0cc2ee. Thank you @joshwilsdon 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Instead of getting the value
Memoryfrom just the root of the containerobject, which is where docker clients < 1.7 put it, we also check in
container.HostConfig.Memory, which is where docker clients >= 1.7 putit.
This commit adds integration tests for this change. These tests create
docker containers with a memory value different than the default memory
value and mimic the behavior of docker clients pre and post 1.7.
This commit also moves
loadConfigSyncto its own module so that it canbe used by tests that need to load the configuration to lookup default
values (such as
defaultMemoryin this case).