Merge #1149

bors[bot] · Alexhuszagh · web-flow · commit 8389923efb89 · 2022-11-22T20:19:54.000Z
1149: Add a comment for how the Dockerfile path is resolved. r=Emilgardis a=Alexhuszagh



Co-authored-by: Alex Huszagh &lt;ahuszagh@gmail.com&gt;
diff --git a/src/docker/custom.rs b/src/docker/custom.rs
@@ -128,6 +128,10 @@ impl<'a> Dockerfile<'a> {
             }
         }
 
+        // note that this is always relative to the PWD: if we have
+        // `$workspace_root/Dockerfile`, then running a build
+        // `PWD=$workspace_root/src/ cross build` would require
+        //  the Dockerfile path to be specified as `../Dockerfile`.
         docker_build.args(["--file".into(), path]);
 
         if let Some(build_opts) = options.config.build_opts() {

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,10 @@ impl<'a> Dockerfile<'a> {`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
	`131`	`+ // note that this is always relative to the PWD: if we have`
	`132`	+ // `$workspace_root/Dockerfile`, then running a build
	`133`	+ // `PWD=$workspace_root/src/ cross build` would require
	`134`	+ // the Dockerfile path to be specified as `../Dockerfile`.
`131`	`135`	`docker_build.args(["--file".into(), path]);`
`132`	`136`
`133`	`137`	`if let Some(build_opts) = options.config.build_opts() {`