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

moved environment variables from Dockerfile to build script

Browse source
This commit is contained in:
Brad 2014-03-04 11:07:41 -08:00
parent 8767edd37a
commit f5d142a4b5
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkg/build/build.go
View file

@ -443,21 +443,6 @@ func (b *Builder) writeDockerfile(dir string) error {
dockerfile.WriteRun("echo 'StrictHostKeyChecking no' > /root/.ssh/config")
}
dockerfile.WriteEnv("CI", "true")
dockerfile.WriteEnv("DRONE", "true")
if b.Repo.Branch != "" {
dockerfile.WriteEnv("DRONE_BRANCH", b.Repo.Branch)
}
if b.Repo.Commit != "" {
dockerfile.WriteEnv("DRONE_COMMIT", b.Repo.Commit)
}
if b.Repo.PR != "" {
dockerfile.WriteEnv("DRONE_PR", b.Repo.PR)
}
if b.Repo.Dir != "" {
dockerfile.WriteEnv("DRONE_BUILD_DIR", b.Repo.Dir)
}
dockerfile.WriteAdd("proxy.sh", "/etc/drone.d/")
dockerfile.WriteEntrypoint("/bin/bash -e /usr/local/bin/drone")
@ -471,6 +456,19 @@ func (b *Builder) writeDockerfile(dir string) error {
func (b *Builder) writeBuildScript(dir string) error {
f := buildfile.New()
// add environment variables about the build
f.WriteEnv("CI", "true")
f.WriteEnv("DRONE", "true")
f.WriteEnv("DRONE_BRANCH", b.Repo.Branch)
f.WriteEnv("DRONE_COMMIT", b.Repo.Commit)
f.WriteEnv("DRONE_PR", b.Repo.PR)
f.WriteEnv("DRONE_BUILD_DIR", b.Repo.Dir)
// add /etc/hosts entries
for _, mapping := range b.Build.Hosts {
f.WriteHost(mapping)
}
// if the repository is remote then we should
// add the commands to the build script to
// clone the repository