Merge pull request #588 from abayer/jenkins-41668

[JENKINS-41668] Add "dir" option for Dockerfile declarative agent
jenkins-infra · Mar 13, 2017 · 29bf87e · 29bf87e
2 parents 8fa807c + dde1b74
commit 29bf87e
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/content/doc/book/pipeline/syntax.adoc b/content/doc/book/pipeline/syntax.adoc
@@ -265,15 +265,11 @@ agent {
 }
 ----
 
-////
-XXX: https://issues.jenkins-ci.org/browse/JENKINS-41607
-
 dockerfile:: Execute the Pipeline, or stage, with a container built from a
-`Dockerfile` contained in the source repository. Conventionally this can be the
-`Dockerfile` in the root of the source repository: `agent { dockerfile true }`
-
-////
-
+`Dockerfile` contained in the source repository. Conventionally this is the
+`Dockerfile` in the root of the source repository: `agent { dockerfile
+true }`. If building a `Dockerfile` in another directory, use the `dir`
+option: `agent { dockerfile { dir 'someSubDir' } }`.
 
 
 [[agent-example]]