Merge remote-tracking branch 'origin'

drone/server/server.go

@@ -418,7 +418,7 @@ func setupEvilGlobals(c *cli.Context, v store.Store) {
 	droneserver.Config.Server.Host = c.String("server-host")
 	droneserver.Config.Server.Port = c.String("server-addr")
 	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.Server.Open = cli.Bool("open")
 	// droneserver.Config.Server.Orgs = sliceToMap(cli.StringSlice("orgs"))

store/datastore/sql/postgres/files/procs.sql

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

store/datastore/sql/postgres/sql_gen.go

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