From 803bcbfec284dbe076cfc65a76c28ad8bbcf1734 Mon Sep 17 00:00:00 2001 From: Vsevolod Strukchinsky Date: Wed, 18 Feb 2015 11:21:10 +0500 Subject: [PATCH] Remove LANG and LANGUAGE from environment Closes #119 --- shared/build/build.go | 4 ++-- shared/build/build_test.go | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/shared/build/build.go b/shared/build/build.go index e77776e8..1ebb4998 100644 --- a/shared/build/build.go +++ b/shared/build/build.go @@ -448,6 +448,8 @@ func (b *Builder) writeDockerfile(dir string) error { // is the "ubuntu" user, since all build images // inherit from the ubuntu cloud ISO dockerfile.WriteUser("ubuntu") + dockerfile.WriteEnv("LANG", "en_US.UTF-8") + dockerfile.WriteEnv("LANGUAGE", "en_US:en") dockerfile.WriteEnv("LOGNAME", "ubuntu") dockerfile.WriteEnv("HOME", "/home/ubuntu") dockerfile.WriteRun("sudo chown -R ubuntu:ubuntu /var/cache/drone") @@ -474,8 +476,6 @@ func (b *Builder) writeBuildScript(dir string) error { f := buildfile.New() // add environment variables for user env - f.WriteEnv("LANG", "en_US.UTF-8") - f.WriteEnv("LANGUAGE", "en_US:en") f.WriteEnv("TERM", "xterm") f.WriteEnv("GOPATH", "/var/cache/drone") f.WriteEnv("SHELL", "/bin/bash") diff --git a/shared/build/build_test.go b/shared/build/build_test.go index 0efa68fd..079a7b63 100644 --- a/shared/build/build_test.go +++ b/shared/build/build_test.go @@ -536,8 +536,6 @@ func TestWriteBuildScript(t *testing.T) { } f := buildfile.New() - f.WriteEnv("LANG", "en_US.UTF-8") - f.WriteEnv("LANGUAGE", "en_US:en") f.WriteEnv("TERM", "xterm") f.WriteEnv("GOPATH", "/var/cache/drone") f.WriteEnv("SHELL", "/bin/bash")