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

fix todo for missing env variables from api

Browse source
This commit is contained in:
Brad Rydzewski 2017-05-23 20:08:06 +02:00
parent 0b4dbf86a4
commit 076dc0c3b9
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/build.go
View file

@ -494,8 +494,8 @@ func PostBuild(c *gin.Context) {
Regs: regs, Regs: regs,
Link: httputil.GetURL(c.Request), Link: httputil.GetURL(c.Request),
Yaml: conf.Data, Yaml: conf.Data,
Envs: buildParams,
} }
// TODO inject environment varibles !!!!!! buildParams
items, err := b.Build() items, err := b.Build()
if err != nil { if err != nil {
build.Status = model.StatusError build.Status = model.StatusError

2
server/hook.go
View file

@ -394,6 +394,7 @@ type builder struct {
Regs []*model.Registry Regs []*model.Registry
Link string Link string
Yaml string Yaml string
Envs map[string]string
} }
type buildItem struct { type buildItem struct {
@ -481,6 +482,7 @@ func (b *builder) Build() ([]*buildItem, error) {
ir := compiler.New( ir := compiler.New(
compiler.WithEnviron(environ), compiler.WithEnviron(environ),
compiler.WithEnviron(b.Envs),
compiler.WithEscalated(Config.Pipeline.Privileged...), compiler.WithEscalated(Config.Pipeline.Privileged...),
compiler.WithVolumes(Config.Pipeline.Volumes...), compiler.WithVolumes(Config.Pipeline.Volumes...),
compiler.WithNetworks(Config.Pipeline.Networks...), compiler.WithNetworks(Config.Pipeline.Networks...),