tools/out-of-tree
1
0
Fork 0
Code Releases Activity

Use squash only if podman is used

Browse Source
This commit is contained in:
dump_stack() 2023-02-11 08:22:37 +00:00
parent 3c8e80cace
commit 422f05d25b
Signed by: dump_stack
GPG Key ID: BE44DA8C062D87DC
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kernel.go
View File

@ -96,8 +96,14 @@ func (cmd *KernelDockerRegenCmd) Run(kernelCmd *KernelCmd, g *Globals) (err erro
return return
} }
cmd := exec.Command("docker", "build", "--squash", "-t", args := []string{"build"}
d.ContainerName, imagePath) _, err = exec.Command("which", "podman").CombinedOutput()
if err != nil {
args = append(args, "--squash")
}
args = append(args, "-t", d.ContainerName, imagePath)
cmd := exec.Command("docker", args...)
var rawOutput []byte var rawOutput []byte
rawOutput, err = cmd.CombinedOutput() rawOutput, err = cmd.CombinedOutput()
if err != nil { if err != nil {
@ -346,7 +352,14 @@ func generateBaseDockerImage(registry string, commands []config.DockerCommand,
return return
} }
cmd = exec.Command("docker", "build", "--squash", "-t", sk.DockerName(), imagePath) args := []string{"build"}
_, err = exec.Command("which", "podman").CombinedOutput()
if err != nil {
args = append(args, "--squash")
}
args = append(args, "-t", sk.DockerName(), imagePath)
cmd = exec.Command("docker", args...)
rawOutput, err = cmd.CombinedOutput() rawOutput, err = cmd.CombinedOutput()
if err != nil { if err != nil {
log.Printf("Base image for %s:%s generating error, see log", log.Printf("Base image for %s:%s generating error, see log",
@ -413,7 +426,14 @@ func dockerImageAppend(sk config.KernelMask, pkgname string) (err error) {
return return
} }
cmd := exec.Command("docker", "build", "--squash", "-t", sk.DockerName(), imagePath) args := []string{"build"}
_, err = exec.Command("which", "podman").CombinedOutput()
if err != nil {
args = append(args, "--squash")
}
args = append(args, "-t", sk.DockerName(), imagePath)
cmd := exec.Command("docker", args...)
rawOutput, err := cmd.CombinedOutput() rawOutput, err := cmd.CombinedOutput()
if err != nil { if err != nil {
// Fallback to previous state // Fallback to previous state