From 9806e6ea9aadd29d03a361af806cb56f918cf481 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Fri, 15 Jan 2016 02:59:07 +0000 Subject: [PATCH] provider/docker: Tweak and test `host_entry` This adds acceptance tests for specifying extra hosts on Docker containers. It also renames the repeating block from `hosts` to `host`, which reads more naturally in the schema when multiple instances of the block are declared. --- r/container.html.markdown | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/r/container.html.markdown b/r/container.html.markdown index 8065a998..dd39a34f 100644 --- a/r/container.html.markdown +++ b/r/container.html.markdown @@ -57,7 +57,7 @@ The following arguments are supported: kept running. If false, then as long as the container exists, Terraform assumes it is successful. * `ports` - (Optional) See [Ports](#ports) below for details. -* `extra_hosts` - (Optional) See [Extra Hosts](#extra_hosts) below for details. +* `host_entry` - (Optional) See [Extra Hosts](#extra_hosts) below for details. * `privileged` - (Optional, bool) Run container in privileged mode. * `publish_all_ports` - (Optional, bool) Publish all ports of the container. * `volumes` - (Optional) See [Volumes](#volumes) below for details. @@ -88,13 +88,16 @@ the following: ## Extra Hosts -`extra_hosts` is a block within the configuration that can be repeated to specify -the extra host mappings for the container. Each `extra_hosts` block supports +`host_entry` is a block within the configuration that can be repeated to specify +the extra host mappings for the container. Each `host_entry` block supports the following: * `host` - (Required, int) Hostname to add. * `ip` - (Required, int) IP address this hostname should resolve to.. +This is equivalent to using the `--add-host` option when using the `run` +command of the Docker CLI. + ## Volumes