darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #880 from floatdrop/master

Browse source 
Remove LANG and LANGUAGE from environment
This commit is contained in:
Brad Rydzewski 2015-02-17 23:54:40 -08:00
commit aca002940d
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shared/build/build.go
View file

@ -448,6 +448,8 @@ func (b *Builder) writeDockerfile(dir string) error {
// is the "ubuntu" user, since all build images // is the "ubuntu" user, since all build images
// inherit from the ubuntu cloud ISO // inherit from the ubuntu cloud ISO
dockerfile.WriteUser("ubuntu") dockerfile.WriteUser("ubuntu")
dockerfile.WriteEnv("LANG", "en_US.UTF-8")
dockerfile.WriteEnv("LANGUAGE", "en_US:en")
dockerfile.WriteEnv("LOGNAME", "ubuntu") dockerfile.WriteEnv("LOGNAME", "ubuntu")
dockerfile.WriteEnv("HOME", "/home/ubuntu") dockerfile.WriteEnv("HOME", "/home/ubuntu")
dockerfile.WriteRun("sudo chown -R ubuntu:ubuntu /var/cache/drone") dockerfile.WriteRun("sudo chown -R ubuntu:ubuntu /var/cache/drone")
@ -474,8 +476,6 @@ func (b *Builder) writeBuildScript(dir string) error {
f := buildfile.New() f := buildfile.New()
// add environment variables for user env // 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("TERM", "xterm")
f.WriteEnv("GOPATH", "/var/cache/drone") f.WriteEnv("GOPATH", "/var/cache/drone")
f.WriteEnv("SHELL", "/bin/bash") f.WriteEnv("SHELL", "/bin/bash")

2
shared/build/build_test.go
View file

@ -536,8 +536,6 @@ func TestWriteBuildScript(t *testing.T) {
} }
f := buildfile.New() f := buildfile.New()
f.WriteEnv("LANG", "en_US.UTF-8")
f.WriteEnv("LANGUAGE", "en_US:en")
f.WriteEnv("TERM", "xterm") f.WriteEnv("TERM", "xterm")
f.WriteEnv("GOPATH", "/var/cache/drone") f.WriteEnv("GOPATH", "/var/cache/drone")
f.WriteEnv("SHELL", "/bin/bash") f.WriteEnv("SHELL", "/bin/bash")