Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

api: Remove double close in ImportImages #24269

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

api: Remove double close in ImportImages #24269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62bb10b
api: Remove double close in ImportImages
Oct 15, 2024
a2599f0
api: Replace close function in condition body
Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions pkg/api/handlers/libpod/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,8 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
decoder := r.Context().Value(api.DecoderKey).(*schema.Decoder)
query := struct {
All bool `schema:"all"`
External bool `schema:"external"`
BuildCache bool `schema:"buildcache"`
All bool `schema:"all"`
External bool `schema:"external"`
}{
// override any golang type defaults
}
Expand Down Expand Up @@ -158,10 +157,9 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
imageEngine := abi.ImageEngine{Libpod: runtime}

pruneOptions := entities.ImagePruneOptions{
All: query.All,
External: query.External,
Filter: libpodFilters,
BuildCache: query.BuildCache,
All: query.All,
External: query.External,
Filter: libpodFilters,
}
imagePruneReports, err := imageEngine.Prune(r.Context(), pruneOptions)
if err != nil {
Expand Down Expand Up @@ -403,10 +401,10 @@ func ImagesImport(w http.ResponseWriter, r *http.Request) {
return
}
defer os.Remove(tmpfile.Name())
defer tmpfile.Close()

if _, err := io.Copy(tmpfile, r.Body); err != nil && err != io.EOF {
utils.Error(w, http.StatusInternalServerError, fmt.Errorf("unable to write archive to temporary file: %w", err))
tmpfile.Close()
return
}

Expand Down