mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
* Runtime: pass a guaranteed environment to bsdtar for predictable behavior without depending on the underlying host configuration.
This commit is contained in:
parent
a373c770b6
commit
561ceac55d
2 changed files with 4 additions and 2 deletions
|
@ -54,6 +54,9 @@ func Tar(path string, compression Compression) (io.Reader, error) {
|
|||
func Untar(archive io.Reader, path string) error {
|
||||
cmd := exec.Command("bsdtar", "-f", "-", "-C", path, "-x")
|
||||
cmd.Stdin = archive
|
||||
// Hardcode locale environment for predictable outcome regardless of host configuration.
|
||||
// (see https://github.com/dotcloud/docker/issues/355)
|
||||
cmd.Env = []string{"LANG=en_US.utf-8", "LC_ALL=en_US.utf-8"}
|
||||
output, err := cmd.CombinedOutput()
|
||||
if err != nil {
|
||||
return fmt.Errorf("%s: %s", err, output)
|
||||
|
|
|
@ -5,6 +5,5 @@ stop on starting rc RUNLEVEL=[016]
|
|||
respawn
|
||||
|
||||
script
|
||||
# FIXME: docker should not depend on the system having en_US.UTF-8
|
||||
LC_ALL='en_US.UTF-8' /usr/bin/docker -d
|
||||
/usr/bin/docker -d
|
||||
end script
|
||||
|
|
Loading…
Reference in a new issue