podman --squash-all requires --layers to cache intermediate layers
This commit is contained in:
parent
fb5b2a2bbb
commit
b1493b79a3
@ -98,7 +98,7 @@ func (cmd *KernelDockerRegenCmd) Run(kernelCmd *KernelCmd, g *Globals) (err erro
|
|||||||
|
|
||||||
args := []string{"build"}
|
args := []string{"build"}
|
||||||
if dockerIsPodman() {
|
if dockerIsPodman() {
|
||||||
args = append(args, "--squash-all")
|
args = append(args, "--layers", "--squash-all")
|
||||||
}
|
}
|
||||||
args = append(args, "-t", d.ContainerName, imagePath)
|
args = append(args, "-t", d.ContainerName, imagePath)
|
||||||
|
|
||||||
@ -353,7 +353,7 @@ func generateBaseDockerImage(registry string, commands []config.DockerCommand,
|
|||||||
|
|
||||||
args := []string{"build"}
|
args := []string{"build"}
|
||||||
if dockerIsPodman() {
|
if dockerIsPodman() {
|
||||||
args = append(args, "--squash-all")
|
args = append(args, "--layers", "--squash-all")
|
||||||
}
|
}
|
||||||
args = append(args, "-t", sk.DockerName(), imagePath)
|
args = append(args, "-t", sk.DockerName(), imagePath)
|
||||||
|
|
||||||
@ -426,7 +426,7 @@ func dockerImageAppend(sk config.KernelMask, pkgname string) (err error) {
|
|||||||
|
|
||||||
args := []string{"build"}
|
args := []string{"build"}
|
||||||
if dockerIsPodman() {
|
if dockerIsPodman() {
|
||||||
args = append(args, "--squash-all")
|
args = append(args, "--layers", "--squash-all")
|
||||||
}
|
}
|
||||||
args = append(args, "-t", sk.DockerName(), imagePath)
|
args = append(args, "-t", sk.DockerName(), imagePath)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user