From ca57ea2dac63b8c33ea6c8dc8e4405edd7fab233 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Mon, 29 May 2023 09:09:30 +0000
Subject: [PATCH] refactor: cache control for the container module

---
 container/container.go | 12 +++---------
 kernel.go              |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/container/container.go b/container/container.go
index 2aec077..34c2d7c 100644
--- a/container/container.go
+++ b/container/container.go
@@ -33,9 +33,7 @@ var Timeout time.Duration
 
 var Commands []config.DockerCommand
 
-// Not thread-safe, but for our case there is no cmdline parameters
-// to update separate containers anyway
-var Update = false
+var UseCache = true
 
 type Image struct {
 	Name   string
@@ -156,10 +154,6 @@ func (c Container) Name() string {
 }
 
 func (c Container) Exist() (yes bool) {
-	if Update {
-		return false
-	}
-
 	cmd := exec.Command(Runtime, "images", "-q", c.name)
 
 	c.Log.Debug().Msgf("run %v", cmd)
@@ -212,7 +206,7 @@ func (c Container) Build(image string, envs, runs []string) (err error) {
 		}
 	}
 
-	if string(buf) == cf && c.Exist() {
+	if string(buf) == cf && c.Exist() && UseCache {
 		return
 	}
 
@@ -239,7 +233,7 @@ func (c Container) Build(image string, envs, runs []string) (err error) {
 
 func (c Container) build(imagePath string) (output string, err error) {
 	args := []string{"build"}
-	if Update {
+	if !UseCache {
 		args = append(args, "--pull", "--no-cache")
 	}
 	args = append(args, "-t", c.name, imagePath)
diff --git a/kernel.go b/kernel.go
index 91be430..c249e20 100644
--- a/kernel.go
+++ b/kernel.go
@@ -151,7 +151,7 @@ func (cmd *KernelCmd) GenKernel(km config.Target, pkg string) {
 
 func (cmd *KernelCmd) Generate(g *Globals, km config.Target) (err error) {
 	if cmd.Update {
-		container.Update = true
+		container.UseCache = false
 	}
 
 	cmd.kcfg, err = config.ReadKernelConfig(g.Config.Kernels)