opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 02:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23767 from Luap99/image-rm

Browse Source 
podman run: ignore image rm error
This commit is contained in:
openshift-merge-bot[bot]
2024-08-27 13:23:44 +00:00
committed by GitHub
parent 9ad3e84cb3 dc724e5e80
commit f0f148ead4
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/podman/containers/run.go
View File

@ -16,7 +16,6 @@ import (
"github.com/containers/podman/v5/pkg/rootless"
"github.com/containers/podman/v5/pkg/specgen"
"github.com/containers/podman/v5/pkg/specgenutil"
"github.com/containers/storage/types"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"golang.org/x/term"
@ -238,18 +237,16 @@ func run(cmd *cobra.Command, args []string) error {
return err
}
if runOpts.Detach && !passthrough {
fmt.Println(report.Id)
if runOpts.Detach {
if !passthrough {
fmt.Println(report.Id)
}
return nil
}
if runRmi {
_, rmErrors := registry.ImageEngine().Remove(registry.GetContext(), []string{imageName}, entities.ImageRemoveOptions{})
_, rmErrors := registry.ImageEngine().Remove(registry.GetContext(), []string{imageName}, entities.ImageRemoveOptions{Ignore: true})
for _, err := range rmErrors {
// ImageUnknown would be a super-unlikely race
if !errors.Is(err, types.ErrImageUnknown) {
// Typical case: ErrImageUsedByContainer
logrus.Warn(err)
}
logrus.Warnf("Failed to remove image: %v", err)
}
}
return nil