Fix matching for volume paths in cp by cpuguy83 · Pull Request #9789 · moby/moby

cpuguy83 · 2014-12-23T15:57:37Z

jessfraz · 2014-12-23T19:51:30Z

LGTM

LK4D4 · 2014-12-23T22:12:26Z

integration-cli/docker_cli_cp_test.go

I'm not sure, but original bug was about bind-mount volumes.

The report was about binds, but the issue is both. I can add a test for both

body {
width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0;
}
.ExternalClass {
width: 100%;
}
.ExternalClass {
line-height: 100%;
}
#backgroundTable {
margin: 0; padding: 0; width: 100% !important; line-height: 100% !important;
}
img {
outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; max-width: 100%; float: left; clear: both; display: block;
}
body {
color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3;
}
body {
font-size: 14px; line-height: 19px;
}
a:hover {
color: #2795b6 !important;
}
a:active {
color: #2795b6 !important;
}
a:visited {
color: #2ba6cb !important;
}
h1 a:active {
color: #2ba6cb !important;
}
h2 a:active {
color: #2ba6cb !important;
}
h3 a:active {
color: #2ba6cb !important;
}
h4 a:active {
color: #2ba6cb !important;
}
h5 a:active {
color: #2ba6cb !important;
}
h6 a:active {
color: #2ba6cb !important;
}
h1 a:visited {
color: #2ba6cb !important;
}
h2 a:visited {
color: #2ba6cb !important;
}
h3 a:visited {
color: #2ba6cb !important;
}
h4 a:visited {
color: #2ba6cb !important;
}
h5 a:visited {
color: #2ba6cb !important;
}
h6 a:visited {
color: #2ba6cb !important;
}
table.button:hover td {
background: #2795b6 !important;
}
table.button:visited td {
background: #2795b6 !important;
}
table.button:active td {
background: #2795b6 !important;
}
table.button:hover td a {
color: #fff !important;
}
table.button:visited td a {
color: #fff !important;
}
table.button:active td a {
color: #fff !important;
}
table.button:hover td {
background: #2795b6 !important;
}
table.tiny-button:hover td {
background: #2795b6 !important;
}
table.small-button:hover td {
background: #2795b6 !important;
}
table.medium-button:hover td {
background: #2795b6 !important;
}
table.large-button:hover td {
background: #2795b6 !important;
}
table.button:hover td a {
color: #ffffff !important;
}
table.button:active td a {
color: #ffffff !important;
}
table.button td a:visited {
color: #ffffff !important;
}
table.tiny-button:hover td a {
color: #ffffff !important;
}
table.tiny-button:active td a {
color: #ffffff !important;
}
table.tiny-button td a:visited {
color: #ffffff !important;
}
table.small-button:hover td a {
color: #ffffff !important;
}
table.small-button:active td a {
color: #ffffff !important;
}
table.small-button td a:visited {
color: #ffffff !important;
}
table.medium-button:hover td a {
color: #ffffff !important;
}
table.medium-button:active td a {
color: #ffffff !important;
}
table.medium-button td a:visited {
color: #ffffff !important;
}
table.large-button:hover td a {
color: #ffffff !important;
}
table.large-button:active td a {
color: #ffffff !important;
}
table.large-button td a:visited {
color: #ffffff !important;
}
table.secondary:hover td {
background: #d0d0d0 !important; color: #555;
}
table.secondary:hover td a {
color: #555 !important;
}
table.secondary td a:visited {
color: #555 !important;
}
table.secondary:active td a {
color: #555 !important;
}
table.success:hover td {
background: #457a1a !important;
}
table.alert:hover td {
background: #970b0e !important;
}
body.outlook p {
display: inline !important;
}
body {
color: #222222; font-family: "Verdana", "Helvetica", "Arial", sans-serif;
}
.rating a:active {
text-decoration: underline; color: #ffffff !important;
}
.rating a:visited {
text-decoration: underline; color: #ffffff !important;
}
.rating a:hover {
color: #000000 !important;
}
@media only screen and (max-width: 600px) {
table[class="body"] img {
width: auto !important; height: auto !important;
}
table[class="body"] center {
min-width: 0 !important;
}
table[class="body"] .container {
width: 95% !important;
}
table[class="body"] .row {
width: 100% !important; display: block !important;
}
table[class="body"] .wrapper {
display: block !important; padding-right: 0 !important;
}
table[class="body"] .columns {
table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important;
}
table[class="body"] .column {
table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important;
}
table[class="body"] .wrapper.first .columns {
display: table !important;
}
table[class="body"] .wrapper.first .column {
display: table !important;
}
table[class="body"] table.columns td {
width: 100% !important;
}
table[class="body"] table.column td {
width: 100% !important;
}
table[class="body"] .columns td.one {
width: 8.333333% !important;
}
table[class="body"] .column td.one {
width: 8.333333% !important;
}
table[class="body"] .columns td.two {
width: 16.666666% !important;
}
table[class="body"] .column td.two {
width: 16.666666% !important;
}
table[class="body"] .columns td.three {
width: 25% !important;
}
table[class="body"] .column td.three {
width: 25% !important;
}
table[class="body"] .columns td.four {
width: 33.333333% !important;
}
table[class="body"] .column td.four {
width: 33.333333% !important;
}
table[class="body"] .columns td.five {
width: 41.666666% !important;
}
table[class="body"] .column td.five {
width: 41.666666% !important;
}
table[class="body"] .columns td.six {
width: 50% !important;
}
table[class="body"] .column td.six {
width: 50% !important;
}
table[class="body"] .columns td.seven {
width: 58.333333% !important;
}
table[class="body"] .column td.seven {
width: 58.333333% !important;
}
table[class="body"] .columns td.eight {
width: 66.666666% !important;
}
table[class="body"] .column td.eight {
width: 66.666666% !important;
}
table[class="body"] .columns td.nine {
width: 75% !important;
}
table[class="body"] .column td.nine {
width: 75% !important;
}
table[class="body"] .columns td.ten {
width: 83.333333% !important;
}
table[class="body"] .column td.ten {
width: 83.333333% !important;
}
table[class="body"] .columns td.eleven {
width: 91.666666% !important;
}
table[class="body"] .column td.eleven {
width: 91.666666% !important;
}
table[class="body"] .columns td.twelve {
width: 100% !important;
}
table[class="body"] .column td.twelve {
width: 100% !important;
}
table[class="body"] td.offset-by-one {
padding-left: 0 !important;
}
table[class="body"] td.offset-by-two {
padding-left: 0 !important;
}
table[class="body"] td.offset-by-three {
padding-left: 0 !important;
}
table[class="body"] td.offset-by-four {
padding-left: 0 !important;
}
table[class="body"] td.offset-by-five {
padding-left: 0 !important;
}
table[class="body"] td.offset-by-six {
padding-left: 0 !important;
}
table[class="body"] td.offset-by-seven {
padding-left: 0 !important;
}
table[class="body"] td.offset-by-eight {
padding-left: 0 !important;
}
table[class="body"] td.offset-by-nine {
padding-left: 0 !important;
}
table[class="body"] td.offset-by-ten {
padding-left: 0 !important;
}
table[class="body"] td.offset-by-eleven {
padding-left: 0 !important;
}
table[class="body"] table.columns td.expander {
width: 1px !important;
}
table[class="body"] .right-text-pad {
padding-left: 10px !important;
}
table[class="body"] .text-pad-right {
padding-left: 10px !important;
}
table[class="body"] .left-text-pad {
padding-right: 10px !important;
}
table[class="body"] .text-pad-left {
padding-right: 10px !important;
}
table[class="body"] .hide-for-small {
display: none !important;
}
table[class="body"] .show-for-desktop {
display: none !important;
}
table[class="body"] .show-for-small {
display: inherit !important;
}
table[class="body"] .hide-for-desktop {
display: inherit !important;
}
}
@media screen {
@font-face {
font-family: 'Roboto Slab'; font-style: normal; font-weight: 700; src: local('Roboto Slab Bold'), local('RobotoSlab-Bold'), url(http://themes.googleusercontent.com/static/fonts/robotoslab/v3/dazS1PrQQuCxC3iOAJFEJRbnBKKEOwRKgsHDreGcocg.woff) format('woff');
}
}

Email Delivery Failure Notice What Happened? There was an issue delivering your message to: [email protected] Why? The domain name of the email address is not valid Advertisement | Prefer no ads? What's next? Check the "gmai.com" part of the email address for misspellings or missing letters. (If you find an error, you might need to correct it in your contacts list or address book too.) If necessary, contact your recipient another way (e.g., phone or text message) to confirm their email address. Prefer step by step assistance? Learn more about this bounce message Rate this email: Helpful Somewhat helpful Not helpful bounce.io 908 Main Street, Suite 360, Louisville, Colorado Copyright © 2014 bounce.io, All rights reserved. Help

Nice comments we have here. Yeah, probably make sense to add for binds too. Tests are cool.

Fixes moby#9787 Signed-off-by: Brian Goff <[email protected]>

cpuguy83 · 2014-12-30T12:54:56Z

Updated with more tests.

jessfraz · 2015-01-05T19:37:40Z

How does this relate to #9871 is it ok with, and doesn't conflict..

cpuguy83 · 2015-01-05T19:53:42Z

Since he's deprecating container.Copy this would conflict with it.

jessfraz · 2015-01-05T20:03:27Z

can you review that PR to make sure there are no breaking changes

jessfraz · 2015-01-05T20:03:52Z

nm i see you did :) thanks

jlhawn · 2015-01-06T00:52:57Z

daemon/container.go

If my volume is mounted at /foo/bar and the resource I want to copy is the directory /foo then the relative path would be .. and this check would succeed.

A bigger issue is that even if I were copying /foo from the container it wouldn't include the contents of the volume.

Yes, this is an issue currently, but probably not a major one.

Was thinking of replacing this with something like container.MountWithVolumes(), which would be similar to container.Mount(), but also bind-mount the volumes into the host's container fs path (and unmount when finished)... not sure.

jessfraz · 2015-01-06T18:11:52Z

since @jlhawn has cherry picked this into #9871 we are going to close this :) and it will be merged with that PR

cpuguy83 force-pushed the 9787_fix_volume_path_detection_on_cp branch 2 times, most recently from 1f4c419 to fc7eead Compare December 23, 2014 19:30

LK4D4 reviewed Dec 23, 2014
View reviewed changes

Fix matching for volume paths in cp

0005eea

Fixes moby#9787 Signed-off-by: Brian Goff <[email protected]>

cpuguy83 force-pushed the 9787_fix_volume_path_detection_on_cp branch from fc7eead to 0005eea Compare December 30, 2014 12:54

jlhawn mentioned this pull request Jan 5, 2015

docker cp to, from, and between containers #9871

Closed

jlhawn reviewed Jan 6, 2015
View reviewed changes

jessfraz closed this Jan 6, 2015

cpuguy83 deleted the 9787_fix_volume_path_detection_on_cp branch January 6, 2015 18:12

cpuguy83 restored the 9787_fix_volume_path_detection_on_cp branch January 6, 2015 18:12

cpuguy83 deleted the 9787_fix_volume_path_detection_on_cp branch September 20, 2017 16:59

Conversation

cpuguy83 commented Dec 23, 2014

Uh oh!

jessfraz commented Dec 23, 2014

Uh oh!

LK4D4 Dec 23, 2014

Choose a reason for hiding this comment

Uh oh!

cpuguy83 Dec 23, 2014

Choose a reason for hiding this comment

Uh oh!

daweir Dec 23, 2014

Choose a reason for hiding this comment

Uh oh!

LK4D4 Dec 23, 2014

Choose a reason for hiding this comment

Uh oh!

cpuguy83 commented Dec 30, 2014

Uh oh!

jessfraz commented Jan 5, 2015

Uh oh!

cpuguy83 commented Jan 5, 2015

Uh oh!

jessfraz commented Jan 5, 2015

Uh oh!

jessfraz commented Jan 5, 2015

Uh oh!

jlhawn Jan 6, 2015

Choose a reason for hiding this comment

Uh oh!

jlhawn Jan 6, 2015

Choose a reason for hiding this comment

Uh oh!

cpuguy83 Jan 6, 2015

Choose a reason for hiding this comment

Uh oh!

jessfraz commented Jan 6, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants