Commit f32d9879 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

builder/docker: error if DOCKER_HOST is set

parent 933c747a
...@@ -55,6 +55,7 @@ BUG FIXES: ...@@ -55,6 +55,7 @@ BUG FIXES:
* builder/amazon/all: Fix race condition on setting tags. [GH-1367] * builder/amazon/all: Fix race condition on setting tags. [GH-1367]
* builder/amazon/all: More desctriptive error messages if Amazon only * builder/amazon/all: More desctriptive error messages if Amazon only
sends an error code. [GH-1189] sends an error code. [GH-1189]
* builder/docker: Error if `DOCKER_HOST` is set.
* builder/docker: Remove the container during cleanup. [GH-1206] * builder/docker: Remove the container during cleanup. [GH-1206]
* builder/docker: Fix case where not all output would show up from * builder/docker: Fix case where not all output would show up from
provisioners. provisioners.
......
...@@ -220,5 +220,10 @@ func (d *DockerDriver) Verify() error { ...@@ -220,5 +220,10 @@ func (d *DockerDriver) Verify() error {
return err return err
} }
if v := os.Getenv("DOCKER_HOST"); v != "" {
return fmt.Errorf(
"DOCKER_HOST cannot be set with the Packer Docker builder.")
}
return nil return nil
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment