mirror of
https://github.com/foomo/squadron.git
synced 2026-10-03 22:27:05 +00:00
feat: do not check image exists
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
+5
-3
@@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user