Fix volumes on recreate #711
Merged
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
|
This is a great idea. Needs a rebase though. :( |
dnephin
force-pushed
the
fix_volumes_on_recreate
branch
from
acd1449
to
456e3e6
Compare
|
I need to stop adding tests at the bottom of the file so I don't have to rebase everytime. Rebased |
|
cc @aanand |
|
I suppose this could use some integration tests showing that it solves the issue. |
dnephin
force-pushed
the
fix_volumes_on_recreate
branch
from
456e3e6
to
abf880e
Compare
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
dnephin
force-pushed
the
fix_volumes_on_recreate
branch
3 times, most recently
from
b2efda5
to
d273947
Compare
|
Ok, this is rebased, and I've added an integration test (which fails on master). |
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
dnephin
force-pushed
the
fix_volumes_on_recreate
branch
from
d273947
to
7eb476e
Compare
|
Oh right, I have to actually start the container in older versions of docker. This test was passing for docker 1.4.1. Pushed another update to get the test working for docker 1.2.0 |
|
LGTM |
|
|
|
Hmm, tests are failing for me against Docker 1.4.1. |
|
Hmm, I didn't actually test it on 1.4.1 after making the change for 1.2.
|
|
I've not reviewed this code but... there exists a bug in 1.4.1 where on start Docker will always try to re-apply everything in volumes-from. If the volumes-from container no longer exists, it will error out. This may be related. |
|
@aanand tests on master are working for me with docker 1.4.1 |
This was referenced Jan 19, 2015
|
I can reproduce it on master on a fresh Digital Ocean machine with Docker 1.4.1 - here's the relevant bit of |
|
@aanand I was able to reproduce the error on another host I believe the issue is related to this TODO I left (service.py#L297) The intermediate container has the correct volumes, but the final container is being passed the config which creates a new volume first (before the correct volume is applied during I'll submit another PR to address the 1.4.1 issue. |
aanand
added a commit
that referenced
this pull request
Jan 20, 2015
Revert #711 from dnephin/fix_volumes_on_recreate
yuval-k
pushed a commit
to yuval-k/compose
that referenced
this pull request
Apr 10, 2015
Fix volumes on recreate Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
yuval-k
pushed a commit
to yuval-k/compose
that referenced
this pull request
Apr 10, 2015
…nges Revert docker#711 from dnephin/fix_volumes_on_recreate Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
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.
Resolves: #447 (and probably some other related issues)
Instead of using
volumes_fromon the intermediate container, inspect the volumes, and copy them over the to intermediate container and from the intermediate to the final container.