parent
74c7b88fb9
commit
803bcbfec2
2 changed files with 2 additions and 4 deletions
|
@ -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")
|
||||||
|
|
|
@ -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")
|
||||||
|
|
Loading…
Reference in a new issue