From 310ea6c0068a7a9a2d5e5ebdd4048f613db55da4 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago Date: Tue, 4 Dec 2018 18:28:48 -0600 Subject: [PATCH 1/2] Updated docker's default config to use regular bourne shell instead of bourne again. Closes #6920. --- builder/docker/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/docker/config.go b/builder/docker/config.go index 6116a995b..ee2844bac 100644 --- a/builder/docker/config.go +++ b/builder/docker/config.go @@ -73,7 +73,7 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) { // Defaults if len(c.RunCommand) == 0 { - c.RunCommand = []string{"-d", "-i", "-t", "{{.Image}}", "/bin/bash"} + c.RunCommand = []string{"-d", "-i", "-t", "{{.Image}}", "/bin/sh"} } // Default Pull if it wasn't set From 2e977019e44869876292a10ed7d37710581f7a05 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago Date: Tue, 4 Dec 2018 23:52:17 -0600 Subject: [PATCH 2/2] Modified the docker builder's default run_command to specify the shell via the entrypoint command line argument as suggested by @vrubiolo in #6920. --- builder/docker/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/docker/config.go b/builder/docker/config.go index ee2844bac..4b1d22240 100644 --- a/builder/docker/config.go +++ b/builder/docker/config.go @@ -73,7 +73,7 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) { // Defaults if len(c.RunCommand) == 0 { - c.RunCommand = []string{"-d", "-i", "-t", "{{.Image}}", "/bin/sh"} + c.RunCommand = []string{"-d", "-i", "-t", "{{.Image}}", "--entrypoint=/bin/sh"} } // Default Pull if it wasn't set