From a0aa44eb9fe438fc07be29bf4feac3dc801fd7ca Mon Sep 17 00:00:00 2001 From: franklin Date: Thu, 8 Apr 2021 10:56:44 +0200 Subject: [PATCH] feat: do not check image exists --- build.go | 5 ----- cmd/actions/build.go | 2 +- cmd/actions/up.go | 8 +++++--- unit.go | 8 ++------ util/docker.go | 5 ----- 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/build.go b/build.go index ade36ce..1f70068 100644 --- a/build.go +++ b/build.go @@ -28,11 +28,6 @@ type Build struct { // ~ Public methods // ------------------------------------------------------------------------------------------------ -func (b *Build) Exists() (bool, error) { - logrus.Infof("checking image exists for %s:%s", b.Image, b.Tag) - return util.NewDockerCommand().ImageExists(b.Image, b.Tag) -} - // Build ... func (b *Build) Build() error { logrus.Infof("running docker build for %q", b.Context) diff --git a/cmd/actions/build.go b/cmd/actions/build.go index 308abbb..72036cb 100644 --- a/cmd/actions/build.go +++ b/cmd/actions/build.go @@ -34,7 +34,7 @@ func build(args []string, cwd string, files []string, push bool) error { } for _, unit := range units { - if err := unit.Build(true); err != nil { + if err := unit.Build(); err != nil { return err } } diff --git a/cmd/actions/up.go b/cmd/actions/up.go index 19c84be..fc0248d 100644 --- a/cmd/actions/up.go +++ b/cmd/actions/up.go @@ -39,9 +39,11 @@ func up(args []string, cwd, namespace string, build, push, diff bool, files []st return err } - for _, unit := range units { - if err := unit.Build(build); err != nil { - return err + if build { + for _, unit := range units { + if err := unit.Build(); err != nil { + return err + } } } diff --git a/unit.go b/unit.go index b5b7d0c..92d5772 100644 --- a/unit.go +++ b/unit.go @@ -11,14 +11,10 @@ type Unit struct { // ------------------------------------------------------------------------------------------------ // Build ... -func (u *Unit) Build(always bool) error { +func (u *Unit) Build() error { for _, build := range u.Builds { - if exists, err := build.Exists(); err != nil { + if err := build.Build(); err != nil { return err - } else if !exists || always { - if err := build.Build(); err != nil { - return err - } } } return nil diff --git a/util/docker.go b/util/docker.go index 0f60bb0..24dfe73 100644 --- a/util/docker.go +++ b/util/docker.go @@ -20,8 +20,3 @@ func (c *DockerCmd) Build(workDir string) *Cmd { func (c *DockerCmd) Push(image, tag string) (string, error) { return c.Args("push", fmt.Sprintf("%s:%s", image, tag)).Run() } - -func (c *DockerCmd) ImageExists(image, tag string) (bool, error) { - out, err := c.Args("images", "--quiet", fmt.Sprintf("%s:%s", image, tag)).Run() - return out != "", err -}