From 2da36b737474ebaf6d6b13412775beb4d128a85a Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 22 May 2019 16:43:29 +0200 Subject: [PATCH] builder/docker: default container dir to "c:/packer-files" on windows --- builder/docker/config.go | 7 ++++++- website/source/docs/builders/docker.html.md | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/builder/docker/config.go b/builder/docker/config.go index 8b41589e0..6f2dba809 100644 --- a/builder/docker/config.go +++ b/builder/docker/config.go @@ -3,6 +3,7 @@ package docker import ( "fmt" "os" + "runtime" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/communicator" @@ -124,7 +125,11 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) { } if c.ContainerDir == "" { - c.ContainerDir = "/packer-files" + if runtime.GOOS == "windows" { + c.ContainerDir = "c:/packer-files" + } else { + c.ContainerDir = "/packer-files" + } } if c.EcrLogin && c.LoginServer == "" { diff --git a/website/source/docs/builders/docker.html.md b/website/source/docs/builders/docker.html.md index 6e70ef6de..e59e6f2c1 100644 --- a/website/source/docs/builders/docker.html.md +++ b/website/source/docs/builders/docker.html.md @@ -232,8 +232,8 @@ You must specify (only) one of `commit`, `discard`, or `export_path`. - `container_dir` (string) - The directory inside container to mount temp directory from host server for work [file - provisioner](/docs/provisioners/file.html). By default this is set to - `/packer-files`. + provisioner](/docs/provisioners/file.html). This defaults to + `c:/packer-files` on windows and `/packer-files` on other systems. - `fix_upload_owner` (boolean) - If true, files uploaded to the container will be owned by the user the container is running as. If false, the owner