From 3bbe7024cd67431e3c4516b9a4dc4ad444b48ede Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 9 Nov 2013 17:22:39 -0800 Subject: [PATCH] website: doc pull --- website/source/docs/builders/docker.html.markdown | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/website/source/docs/builders/docker.html.markdown b/website/source/docs/builders/docker.html.markdown index a6807aac4..c3f9f8018 100644 --- a/website/source/docs/builders/docker.html.markdown +++ b/website/source/docs/builders/docker.html.markdown @@ -27,7 +27,10 @@ no provisioners are defined, but it will effectively repackage an image. ## Configuration Reference -All configuration options are currently required. +Configuration options are organized below into two categories: required and optional. Within +each category, the available options are alphabetized and described. + +Required: * `export_path` (string) - The path where the final container will be exported as a tar file. @@ -36,6 +39,12 @@ All configuration options are currently required. be started. This image will be pulled from the Docker registry if it doesn't already exist. +Optional: + +* `pull` (bool) - If true, the configured image will be pulled using + `docker pull` prior to use. Otherwise, it is assumed the image already + exists and can be used. This defaults to true if not set. + ## Dockerfiles This builder allows you to build Docker images _without_ Dockerfiles. If