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

Revert podman layer squashing, does not work well with caching

Browse Source
This commit is contained in:
dump_stack() 2023-02-11 15:02:21 +00:00
parent b1493b79a3
commit 8b5ce9923b
Signed by: dump_stack
GPG Key ID: BE44DA8C062D87DC
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel.go
View File

@ -97,9 +97,6 @@ func (cmd *KernelDockerRegenCmd) Run(kernelCmd *KernelCmd, g *Globals) (err erro
} }
args := []string{"build"} args := []string{"build"}
if dockerIsPodman() {
args = append(args, "--layers", "--squash-all")
}
args = append(args, "-t", d.ContainerName, imagePath) args = append(args, "-t", d.ContainerName, imagePath)
cmd := exec.Command("docker", args...) cmd := exec.Command("docker", args...)
@ -352,9 +349,6 @@ func generateBaseDockerImage(registry string, commands []config.DockerCommand,
} }
args := []string{"build"} args := []string{"build"}
if dockerIsPodman() {
args = append(args, "--layers", "--squash-all")
}
args = append(args, "-t", sk.DockerName(), imagePath) args = append(args, "-t", sk.DockerName(), imagePath)
cmd = exec.Command("docker", args...) cmd = exec.Command("docker", args...)
@ -425,9 +419,6 @@ func dockerImageAppend(sk config.KernelMask, pkgname string) (err error) {
} }
args := []string{"build"} args := []string{"build"}
if dockerIsPodman() {
args = append(args, "--layers", "--squash-all")
}
args = append(args, "-t", sk.DockerName(), imagePath) args = append(args, "-t", sk.DockerName(), imagePath)
cmd := exec.Command("docker", args...) cmd := exec.Command("docker", args...)
@ -763,11 +754,3 @@ func generateKernels(km config.KernelMask, registry string,
} }
return return
} }
func dockerIsPodman() bool {
output, err := exec.Command("docker", "version").CombinedOutput()
if err != nil {
return false
}
return strings.Contains(strings.ToLower(string(output)), "podman")
}