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
[17.03] Fix issue backporting mount spec to pre-1.13 obj #33207
Conversation
daemon/volumes.go
Outdated
from, _, err := volume.ParseVolumesFrom(fromSpec) | ||
if err != nil { | ||
logrus.WithError(err).WithField("id", container.ID).Error("Error reading volumes-from spec during mount spec backport") | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
May have missed this in the original PR as well, need a continue
here 😓
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
noticed one thing we overlooked, but otherwise looks good
In some cases a mount spec would not be properly backported which could lead to accidental removal of the underlying volume on container remove (which should never happen with named volumes). Adds unit tests for this as well. Unfortunately I had to add a daemon depdency for the backport function due to looking up `VolumesFrom` specs. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 3cf1859) Signed-off-by: Brian Goff <cpuguy83@gmail.com>
7976d2f
to
d772750
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
All green |
Cherry-picks #32821 to 17.03 for 17.03.2
ping @thaJeztah @mlaventure