USEFULL/drone
1
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-16 20:45:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin'

Browse Source
This commit is contained in:
Brad Rydzewski 2017-05-11 10:37:39 +02:00
commit e2de82c12b
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drone/server/server.go
View File

@ -418,7 +418,7 @@ func setupEvilGlobals(c *cli.Context, v store.Store) {
droneserver.Config.Server.Host = c.String("server-host") droneserver.Config.Server.Host = c.String("server-host")
droneserver.Config.Server.Port = c.String("server-addr") droneserver.Config.Server.Port = c.String("server-addr")
droneserver.Config.Pipeline.Networks = c.StringSlice("network") droneserver.Config.Pipeline.Networks = c.StringSlice("network")
droneserver.Config.Pipeline.Volumes = c.StringSlice("volumes") droneserver.Config.Pipeline.Volumes = c.StringSlice("volume")
droneserver.Config.Pipeline.Privileged = c.StringSlice("escalate") droneserver.Config.Pipeline.Privileged = c.StringSlice("escalate")
// droneserver.Config.Server.Open = cli.Bool("open") // droneserver.Config.Server.Open = cli.Bool("open")
// droneserver.Config.Server.Orgs = sliceToMap(cli.StringSlice("orgs")) // droneserver.Config.Server.Orgs = sliceToMap(cli.StringSlice("orgs"))

1
store/datastore/sql/postgres/files/procs.sql
View File

@ -37,6 +37,7 @@ SELECT
,proc_environ ,proc_environ
FROM procs FROM procs
WHERE proc_build_id = $1 WHERE proc_build_id = $1
ORDER BY proc_pid ASC
-- name: procs-find-build-pid -- name: procs-find-build-pid

1
store/datastore/sql/postgres/sql_gen.go
View File

@ -164,6 +164,7 @@ SELECT
,proc_environ ,proc_environ
FROM procs FROM procs
WHERE proc_build_id = $1 WHERE proc_build_id = $1
ORDER BY proc_pid ASC
` `
var procsFindBuildPid = ` var procsFindBuildPid = `