chaos/drone-runner-podman
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use correct registry plugin token var

Browse Source
This commit is contained in:
Brad Rydzewski
2020-02-04 14:23:19 -08:00
parent 057639f3ca
commit 55560d5473
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
command/daemon/config.go
View File

@@ -92,7 +92,7 @@ type Config struct {
Registry struct { Registry struct {
Endpoint string `envconfig:"DRONE_REGISTRY_PLUGIN_ENDPOINT"` Endpoint string `envconfig:"DRONE_REGISTRY_PLUGIN_ENDPOINT"`
Token string `envconfig:"DRONE_REGISTRY_PLUGIN_SECRET"` Token string `envconfig:"DRONE_REGISTRY_PLUGIN_TOKEN"`
SkipVerify bool `envconfig:"DRONE_REGISTRY_PLUGIN_SKIP_VERIFY"` SkipVerify bool `envconfig:"DRONE_REGISTRY_PLUGIN_SKIP_VERIFY"`
} }
@@ -105,28 +105,29 @@ type Config struct {
// legacy environment variables. the key is the legacy // legacy environment variables. the key is the legacy
// variable name, and the value is the new variable name. // variable name, and the value is the new variable name.
var legacy = map[string]string{ var legacy = map[string]string{
"DRONE_MACHINE": "DRONE_RUNNER_NAME", "DRONE_MACHINE": "DRONE_RUNNER_NAME",
"DRONE_RUNNER_OS": "DRONE_PLATFORM_OS", "DRONE_RUNNER_OS": "DRONE_PLATFORM_OS",
"DRONE_RUNNER_ARCH": "DRONE_PLATFORM_ARCH", "DRONE_RUNNER_ARCH": "DRONE_PLATFORM_ARCH",
"DRONE_RUNNER_KERNEL": "DRONE_PLATFORM_KERNEL", "DRONE_RUNNER_KERNEL": "DRONE_PLATFORM_KERNEL",
"DRONE_RUNNER_VARIANT": "DRONE_PLATFORM_VARIANT", "DRONE_RUNNER_VARIANT": "DRONE_PLATFORM_VARIANT",
"DRONE_REGISTRY_ENDPOINT": "DRONE_REGISTRY_PLUGIN_ENDPOINT", "DRONE_REGISTRY_ENDPOINT": "DRONE_REGISTRY_PLUGIN_ENDPOINT",
"DRONE_REGISTRY_SECRET": "DRONE_REGISTRY_PLUGIN_SECRET", "DRONE_REGISTRY_SECRET": "DRONE_REGISTRY_PLUGIN_TOKEN",
"DRONE_REGISTRY_SKIP_VERIFY": "DRONE_REGISTRY_PLUGIN_SKIP_VERIFY", "DRONE_REGISTRY_PLUGIN_SECRET": "DRONE_REGISTRY_PLUGIN_TOKEN",
"DRONE_SECRET_ENDPOINT": "DRONE_SECRET_PLUGIN_ENDPOINT", "DRONE_REGISTRY_SKIP_VERIFY": "DRONE_REGISTRY_PLUGIN_SKIP_VERIFY",
"DRONE_SECRET_SECRET": "DRONE_SECRET_PLUGIN_TOKEN", "DRONE_SECRET_ENDPOINT": "DRONE_SECRET_PLUGIN_ENDPOINT",
"DRONE_SECRET_SKIP_VERIFY": "DRONE_SECRET_PLUGIN_SKIP_VERIFY", "DRONE_SECRET_SECRET": "DRONE_SECRET_PLUGIN_TOKEN",
"DRONE_LIMIT_MEM_SWAP": "DRONE_MEMORY_SWAP_LIMIT", "DRONE_SECRET_SKIP_VERIFY": "DRONE_SECRET_PLUGIN_SKIP_VERIFY",
"DRONE_LIMIT_MEM": "DRONE_MEMORY_LIMIT", "DRONE_LIMIT_MEM_SWAP": "DRONE_MEMORY_SWAP_LIMIT",
"DRONE_LIMIT_CPU_QUOTA": "DRONE_CPU_QUOTA", "DRONE_LIMIT_MEM": "DRONE_MEMORY_LIMIT",
"DRONE_LIMIT_CPU_SHARES": "DRONE_CPU_SHARES", "DRONE_LIMIT_CPU_QUOTA": "DRONE_CPU_QUOTA",
"DRONE_LIMIT_CPU_SET": "DRONE_CPU_SET", "DRONE_LIMIT_CPU_SHARES": "DRONE_CPU_SHARES",
"DRONE_LOGS_DEBUG": "DRONE_DEBUG", "DRONE_LIMIT_CPU_SET": "DRONE_CPU_SET",
"DRONE_LOGS_TRACE": "DRONE_TRACE", "DRONE_LOGS_DEBUG": "DRONE_DEBUG",
"DRONE_SERVER_PROTO": "DRONE_HTTP_PROTO", "DRONE_LOGS_TRACE": "DRONE_TRACE",
"DRONE_SERVER_HOST": "DRONE_HTTP_HOST", "DRONE_SERVER_PROTO": "DRONE_HTTP_PROTO",
"DRONE_SERVER_PORT": "DRONE_HTTP_BIND", "DRONE_SERVER_HOST": "DRONE_HTTP_HOST",
"DRONE_SERVER_ACME": "DRONE_HTTP_ACME", "DRONE_SERVER_PORT": "DRONE_HTTP_BIND",
"DRONE_SERVER_ACME": "DRONE_HTTP_ACME",
} }
func fromEnviron() (Config, error) { func fromEnviron() (Config, error) {