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

Squash podman layers, not docker layers

Browse Source
This commit is contained in:
dump_stack() 2023-02-11 08:33:20 +00:00
parent bb7c2f94d5
commit 55032f07af
Signed by: dump_stack
GPG Key ID: BE44DA8C062D87DC
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel.go
View File

@ -98,7 +98,7 @@ func (cmd *KernelDockerRegenCmd) Run(kernelCmd *KernelCmd, g *Globals) (err erro
args := []string{"build"} args := []string{"build"}
_, err = exec.Command("which", "podman").CombinedOutput() _, err = exec.Command("which", "podman").CombinedOutput()
if err != nil { if err == nil {
args = append(args, "--squash-all") args = append(args, "--squash-all")
} }
args = append(args, "-t", d.ContainerName, imagePath) args = append(args, "-t", d.ContainerName, imagePath)
@ -354,7 +354,7 @@ func generateBaseDockerImage(registry string, commands []config.DockerCommand,
args := []string{"build"} args := []string{"build"}
_, err = exec.Command("which", "podman").CombinedOutput() _, err = exec.Command("which", "podman").CombinedOutput()
if err != nil { if err == nil {
args = append(args, "--squash-all") args = append(args, "--squash-all")
} }
args = append(args, "-t", sk.DockerName(), imagePath) args = append(args, "-t", sk.DockerName(), imagePath)
@ -428,7 +428,7 @@ func dockerImageAppend(sk config.KernelMask, pkgname string) (err error) {
args := []string{"build"} args := []string{"build"}
_, err = exec.Command("which", "podman").CombinedOutput() _, err = exec.Command("which", "podman").CombinedOutput()
if err != nil { if err == nil {
args = append(args, "--squash-all") args = append(args, "--squash-all")
} }
args = append(args, "-t", sk.DockerName(), imagePath) args = append(args, "-t", sk.DockerName(), imagePath)