diff --git a/command/daemon/config.go b/command/daemon/config.go index c56f3a1..f2d4a35 100644 --- a/command/daemon/config.go +++ b/command/daemon/config.go @@ -35,10 +35,10 @@ type Config struct { } Server struct { - Proto string `envconfig:"DRONE_SERVER_PROTO"` - Host string `envconfig:"DRONE_SERVER_HOST"` - Port string `envconfig:"DRONE_SERVER_PORT" default:":3000"` - Acme bool `envconfig:"DRONE_SERVER_ACME"` + Port string `envconfig:"DRONE_HTTP_BIND" default:":3000"` + Proto string `envconfig:"DRONE_HTTP_PROTO"` + Host string `envconfig:"DRONE_HTTP_HOST"` + Acme bool `envconfig:"DRONE_HTTP_ACME"` } Keypair struct { @@ -104,24 +104,28 @@ type Config struct { // legacy environment variables. the key is the legacy // variable name, and the value is the new variable name. var legacy = map[string]string{ - "DRONE_MACHINE": "DRONE_RUNNER_NAME", - // registry settings + "DRONE_MACHINE": "DRONE_RUNNER_NAME", + "DRONE_RUNNER_OS": "DRONE_PLATFORM_OS", + "DRONE_RUNNER_ARCH": "DRONE_PLATFORM_ARCH", + "DRONE_RUNNER_KERNEL": "DRONE_PLATFORM_KERNEL", + "DRONE_RUNNER_VARIANT": "DRONE_PLATFORM_VARIANT", "DRONE_REGISTRY_ENDPOINT": "DRONE_REGISTRY_PLUGIN_ENDPOINT", "DRONE_REGISTRY_SECRET": "DRONE_REGISTRY_PLUGIN_SECRET", "DRONE_REGISTRY_SKIP_VERIFY": "DRONE_REGISTRY_PLUGIN_SKIP_VERIFY", - // secret settings - "DRONE_SECRET_ENDPOINT": "DRONE_SECRET_PLUGIN_ENDPOINT", - "DRONE_SECRET_SECRET": "DRONE_SECRET_PLUGIN_TOKEN", - "DRONE_SECRET_SKIP_VERIFY": "DRONE_SECRET_PLUGIN_SKIP_VERIFY", - // resource settings - "DRONE_LIMIT_MEM_SWAP": "DRONE_MEMORY_SWAP_LIMIT", - "DRONE_LIMIT_MEM": "DRONE_MEMORY_LIMIT", - "DRONE_LIMIT_CPU_QUOTA": "DRONE_CPU_QUOTA", - "DRONE_LIMIT_CPU_SHARES": "DRONE_CPU_SHARES", - "DRONE_LIMIT_CPU_SET": "DRONE_CPU_SET", - // logger settings - "DRONE_LOGS_DEBUG": "DRONE_DEBUG", - "DRONE_LOGS_TRACE": "DRONE_TRACE", + "DRONE_SECRET_ENDPOINT": "DRONE_SECRET_PLUGIN_ENDPOINT", + "DRONE_SECRET_SECRET": "DRONE_SECRET_PLUGIN_TOKEN", + "DRONE_SECRET_SKIP_VERIFY": "DRONE_SECRET_PLUGIN_SKIP_VERIFY", + "DRONE_LIMIT_MEM_SWAP": "DRONE_MEMORY_SWAP_LIMIT", + "DRONE_LIMIT_MEM": "DRONE_MEMORY_LIMIT", + "DRONE_LIMIT_CPU_QUOTA": "DRONE_CPU_QUOTA", + "DRONE_LIMIT_CPU_SHARES": "DRONE_CPU_SHARES", + "DRONE_LIMIT_CPU_SET": "DRONE_CPU_SET", + "DRONE_LOGS_DEBUG": "DRONE_DEBUG", + "DRONE_LOGS_TRACE": "DRONE_TRACE", + "DRONE_SERVER_PROTO": "DRONE_HTTP_PROTO", + "DRONE_SERVER_HOST": "DRONE_HTTP_HOST", + "DRONE_SERVER_PORT": "DRONE_HTTP_BIND", + "DRONE_SERVER_ACME": "DRONE_HTTP_ACME", } func fromEnviron() (Config, error) { diff --git a/docker/Docker.windows.amd64.1809 b/docker/Dockerfile.windows.amd64.1809 similarity index 100% rename from docker/Docker.windows.amd64.1809 rename to docker/Dockerfile.windows.amd64.1809 diff --git a/docker/Docker.windows.amd64.1903 b/docker/Dockerfile.windows.amd64.1903 similarity index 100% rename from docker/Docker.windows.amd64.1903 rename to docker/Dockerfile.windows.amd64.1903 diff --git a/go.mod b/go.mod index 072af30..182af7a 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/docker/go-connections v0.3.0 // indirect github.com/drone/drone-go v1.0.5-0.20190504210458-4d6116b897ba github.com/drone/envsubst v1.0.2 - github.com/drone/runner-go v1.2.3-0.20191031003804-fcde0c5625b9 + github.com/drone/runner-go v1.3.0 github.com/drone/signal v1.0.0 github.com/ghodss/yaml v1.0.0 github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506 // indirect diff --git a/go.sum b/go.sum index 0a23cd6..89cafe5 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,10 @@ github.com/drone/runner-go v1.2.3-0.20191022224645-c23a30094df2 h1:cWCxBb42XWdTX github.com/drone/runner-go v1.2.3-0.20191022224645-c23a30094df2/go.mod h1:GvB5hX023g0n5UZUjMBmudk6givdDDuLcls7Nolm5v8= github.com/drone/runner-go v1.2.3-0.20191031003804-fcde0c5625b9 h1:cInMHvQe7n3KBwBJyH1Otw8MbPDDBxtMskWY/kISbxY= github.com/drone/runner-go v1.2.3-0.20191031003804-fcde0c5625b9/go.mod h1:61VgQWhZbNPXp01lBuR7PAztTMySGLnMzK/4oYE3D9Y= +github.com/drone/runner-go v1.2.3-0.20191031202840-a11193321443 h1:uu8lbyWKBx0Y1ycE/RQBP9d5yJ1/bDEyh/DfHV/SMh0= +github.com/drone/runner-go v1.2.3-0.20191031202840-a11193321443/go.mod h1:61VgQWhZbNPXp01lBuR7PAztTMySGLnMzK/4oYE3D9Y= +github.com/drone/runner-go v1.3.0 h1:RGJIk7vbvxdfd3wFyiP4XkLO+b5esCLg1aFUCIHISeE= +github.com/drone/runner-go v1.3.0/go.mod h1:61VgQWhZbNPXp01lBuR7PAztTMySGLnMzK/4oYE3D9Y= github.com/drone/signal v1.0.0 h1:NrnM2M/4yAuU/tXs6RP1a1ZfxnaHwYkd0kJurA1p6uI= github.com/drone/signal v1.0.0/go.mod h1:S8t92eFT0g4WUgEc/LxG+LCuiskpMNsG0ajAMGnyZpc= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=