Using more generic configuration & respecting win

This commit is contained in:
Andrea Cervesato
2020-03-24 21:00:24 +01:00
parent 18c4e995d3
commit 063f479004
4 changed files with 20 additions and 28 deletions

View File

@@ -209,9 +209,9 @@ func main() {
EnvVar: "PLUGIN_EMAIL,DOCKER_EMAIL",
},
cli.StringFlag{
Name: "docker.authconfig",
Usage: "docker json authconfig content",
EnvVar: "PLUGIN_AUTHCONFIG,DOCKER_AUTHCONFIG",
Name: "docker.docker_config",
Usage: "docker json dockerconfig content",
EnvVar: "PLUGIN_DOCKER_CONFIG,DOCKER_CONFIG",
},
cli.BoolTFlag{
Name: "docker.purge",
@@ -249,7 +249,7 @@ func run(c *cli.Context) error {
Username: c.String("docker.username"),
Password: c.String("docker.password"),
Email: c.String("docker.email"),
AuthConfig: c.String("docker.authconfig"),
DockerConfig: c.String("docker.docker_config"),
},
Build: docker.Build{
Remote: c.String("remote.url"),