Merge #409

409: Allow to mount host path in docker-in-docker mode r=reitermarkus a=romainreignier As discussed here: #387 (comment) The check is not needed to allow to mount paths that are mounted in the first docker with the same path. Co-authored-by: Romain Reignier <[email protected]>
cross-rs · May 3, 2020 · b5509fc · b5509fc
2 parents de91808 + 56accbe
commit b5509fc
Showing 1 changed file with 4 additions and 25 deletions.
diff --git a/src/docker.rs b/src/docker.rs
@@ -257,12 +257,10 @@ fn dockerinfo_parse_user_mounts(info: &serde_json::Value) -> Vec<MountDetail> {
             for details in v {
                 let source = make_path(&details["Source"]);
                 let destination = make_path(&details["Destination"]);
-                if source != destination {
-                    mounts.push(MountDetail {
-                        source,
-                        destination,
-                    });
-                }
+                mounts.push(MountDetail {
+                    source,
+                    destination,
+                });
             }
             mounts
         })
@@ -387,25 +385,6 @@ mod tests {
             assert_eq!(want, actual);
         }
 
-        #[test]
-        fn test_parse_user_mounts_remove_if_source_dest_eq() {
-            let actual = dockerinfo_parse_user_mounts(&json!([{
-                "Mounts": [
-                    {
-                        "Type": "bind",
-                        "Source": "/var/run/docker.sock",
-                        "Destination": "/var/run/docker.sock",
-                    },
-                    {
-                        "Type": "bind",
-                        "Source": "/mounted/path",
-                        "Destination": "/mounted/path",
-                    }
-                ],
-            }]));
-            assert_eq!(Vec::<MountDetail>::new(), actual);
-        }
-
         #[test]
         fn test_parse_empty_user_mounts() {
             let actual = dockerinfo_parse_user_mounts(&json!([{