mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-25 11:21:02 +00:00
Code Issues Projects Releases Wiki Activity

bump version number, auto-pull new plugins, process http_proxy vars

Browse source
This commit is contained in:
Brad Rydzewski 2016-05-12 22:14:33 -07:00
parent 56b6eb1b0c
commit a6e9c215ec
3 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drone/agent/agent.go
View file

@ -117,7 +117,7 @@ var AgentCmd = cli.Command{
Value: "plugins", Value: "plugins",
Usage: "default plugin image namespace", Usage: "default plugin image namespace",
}, },
cli.BoolFlag{ cli.BoolTFlag{
EnvVar: "DRONE_PLUGIN_PULL", EnvVar: "DRONE_PLUGIN_PULL",
Name: "pull", Name: "pull",
Usage: "always pull latest plugin images", Usage: "always pull latest plugin images",
@ -172,7 +172,7 @@ func start(c *cli.Context) {
timeout: c.Duration("timeout"), timeout: c.Duration("timeout"),
namespace: c.String("namespace"), namespace: c.String("namespace"),
privileged: c.StringSlice("privileged"), privileged: c.StringSlice("privileged"),
pull: c.Bool("pull"), pull: c.BoolT("pull"),
logs: int64(c.Int("max-log-size")) * 1000000, logs: int64(c.Int("max-log-size")) * 1000000,
}, },
} }

4
version/version.go
View file

@ -6,9 +6,9 @@ var (
// VersionMajor is for an API incompatible changes // VersionMajor is for an API incompatible changes
VersionMajor = 0 VersionMajor = 0
// VersionMinor is for functionality in a backwards-compatible manner // VersionMinor is for functionality in a backwards-compatible manner
VersionMinor = 4 VersionMinor = 5
// VersionPatch is for backwards-compatible bug fixes // VersionPatch is for backwards-compatible bug fixes
VersionPatch = 1 VersionPatch = 0
// VersionDev indicates development branch. Releases will be empty string. // VersionDev indicates development branch. Releases will be empty string.
VersionDev = "dev" VersionDev = "dev"

25
yaml/transform/environ.go
View file

@ -1,6 +1,17 @@
package transform package transform
import "github.com/drone/drone/yaml" import (
"os"
"strings"
"github.com/drone/drone/yaml"
)
var (
httpProxy = os.Getenv("HTTP_PROXY")
httpsProxy = os.Getenv("HTTPS_PROXY")
noProxy = os.Getenv("NO_PROXY")
)
// Environ transforms the steps in the Yaml pipeline to include runtime // Environ transforms the steps in the Yaml pipeline to include runtime
// environment variables. // environment variables.
@ -15,6 +26,18 @@ func Environ(c *yaml.Config, envs map[string]string) error {
} }
p.Environment[k] = v p.Environment[k] = v
} }
if httpProxy != "" {
p.Environment["HTTP_PROXY"] = httpProxy
p.Environment["http_proxy"] = strings.ToUpper(httpProxy)
}
if httpsProxy != "" {
p.Environment["HTTPS_PROXY"] = httpsProxy
p.Environment["https_proxy"] = strings.ToUpper(httpsProxy)
}
if noProxy != "" {
p.Environment["NO_PROXY"] = noProxy
p.Environment["no_proxy"] = strings.ToUpper(noProxy)
}
} }
return nil return nil
} }