From 26d1bc9d01ca71338b60df2eb99dbd70598503a0 Mon Sep 17 00:00:00 2001 From: Benjamin Jorand Date: Fri, 22 Sep 2017 12:10:05 +0200 Subject: [PATCH 1/4] push image with tag latest --- pipeline/docker/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline/docker/docker.go b/pipeline/docker/docker.go index 28a6dd089..2aaed3548 100644 --- a/pipeline/docker/docker.go +++ b/pipeline/docker/docker.go @@ -91,7 +91,7 @@ func process(ctx *context.Context, folder string, docker config.Docker, binary c return err } if docker.Latest { - if err := dockerTag(image, latest); err != nil { + if err := dockerPush(latest); err != nil { return err } } From 2e31f04bf9a52b405f17f64e4eeb8282f32fd2eb Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Fri, 22 Sep 2017 09:26:19 -0300 Subject: [PATCH 2/4] fix --- pipeline/docker/docker.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pipeline/docker/docker.go b/pipeline/docker/docker.go index 2aaed3548..d36607e21 100644 --- a/pipeline/docker/docker.go +++ b/pipeline/docker/docker.go @@ -80,7 +80,7 @@ func process(ctx *context.Context, folder string, docker config.Docker, binary c } } - // TODO: improve this so it can log into to stdout + // TODO: improve this so it can log it to stdout if !ctx.Publish { return pipeline.Skip("--skip-publish is set") } @@ -90,13 +90,14 @@ func process(ctx *context.Context, folder string, docker config.Docker, binary c if err := dockerPush(image); err != nil { return err } - if docker.Latest { - if err := dockerPush(latest); err != nil { - return err - } - } ctx.AddDocker(image) - return nil + if !docker.Latest { + return nil + } + if err := dockerTag(image, latest); err != nil { + return err + } + return dockerPush(latest) } func dockerBuild(root, dockerfile, image string) error { @@ -123,7 +124,7 @@ func dockerTag(image, tag string) error { return nil } -func dockerPush(image string) error { +func dockerPush(images ...string) error { log.WithField("image", image).Info("pushing docker image") var cmd = exec.Command("docker", "push", image) log.WithField("cmd", cmd).Debug("executing") From 230d794c7537f32a37b4f5be92688c34ae2d4dac Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Fri, 22 Sep 2017 09:26:35 -0300 Subject: [PATCH 3/4] fix --- pipeline/docker/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline/docker/docker.go b/pipeline/docker/docker.go index d36607e21..da2cc25c0 100644 --- a/pipeline/docker/docker.go +++ b/pipeline/docker/docker.go @@ -124,7 +124,7 @@ func dockerTag(image, tag string) error { return nil } -func dockerPush(images ...string) error { +func dockerPush(images string) error { log.WithField("image", image).Info("pushing docker image") var cmd = exec.Command("docker", "push", image) log.WithField("cmd", cmd).Debug("executing") From ff0750285c388c34287bc0b6d5f17704d2122f2e Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Fri, 22 Sep 2017 09:44:15 -0300 Subject: [PATCH 4/4] typo --- pipeline/docker/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline/docker/docker.go b/pipeline/docker/docker.go index da2cc25c0..b6bb9e011 100644 --- a/pipeline/docker/docker.go +++ b/pipeline/docker/docker.go @@ -124,7 +124,7 @@ func dockerTag(image, tag string) error { return nil } -func dockerPush(images string) error { +func dockerPush(image string) error { log.WithField("image", image).Info("pushing docker image") var cmd = exec.Command("docker", "push", image) log.WithField("cmd", cmd).Debug("executing")