containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21004 from umohnani8/push-endpoint 

Fix push endpoint stream
This commit is contained in:
openshift-merge-bot[bot] 2023-12-13 22:41:33 +00:00 committed by GitHub
parent 5e76a88a32 126670d5dd
commit b82e336751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/handlers/libpod/images_push.go
View File

@ -81,7 +81,7 @@ func PushImage(w http.ResponseWriter, r *http.Request) {
ForceCompressionFormat: query.ForceCompressionFormat, ForceCompressionFormat: query.ForceCompressionFormat,
Format: query.Format, Format: query.Format,
Password: password, Password: password,
Quiet: true, Quiet: query.Quiet,
RemoveSignatures: query.RemoveSignatures, RemoveSignatures: query.RemoveSignatures,
Username: username, Username: username,
} }
@ -150,9 +150,9 @@ func PushImage(w http.ResponseWriter, r *http.Request) {
} }
if pushError != nil { if pushError != nil {
stream.Error = pushError.Error() stream.Error = pushError.Error()
if err := enc.Encode(stream); err != nil { }
logrus.Warnf("Failed to encode json: %v", err) if err := enc.Encode(stream); err != nil {
} logrus.Warnf("Failed to encode json: %v", err)
} }
flush() flush()
return return

15
test/apiv2/12-imagesMore.at
View File

@ -43,8 +43,23 @@ s1=$(jq -r .status <<<"${lines[1]}")
like "$s1" "mytag: digest: sha256:[0-9a-f]\{64\} size: [0-9]\+" \ like "$s1" "mytag: digest: sha256:[0-9a-f]\{64\} size: [0-9]\+" \
"Push to local registry: second status line" "Push to local registry: second status line"
# Push to local registry using the libpod endpoint with quiet=false...
# First create a new tag for the image to push
t POST "libpod/images/$IMAGE/tag?repo=localhost:$REGISTRY_PORT/myrepo&tag=quiet-false" 201
t POST "libpod/images/localhost:$REGISTRY_PORT/myrepo:quiet-false/push?tlsVerify=false&quiet=false" 200
# ...and check output. We can't use our built-in checks because this output
# is a sequence of JSON objects, i.e., individual ones, not in a JSON array.
# The lines themselves are valid JSON, but taken together they are not.
readarray lines <<<"$output"
s0=$(jq -r .manifestdigest <<<"${lines[-1]}")
like "$s0" "sha256:[0-9a-f]\{64\}" \
"Push to local registry: last line in push report"
# Untag the image # Untag the image
t POST "libpod/images/$iid/untag?repo=localhost:$REGISTRY_PORT/myrepo&tag=mytag" 201 t POST "libpod/images/$iid/untag?repo=localhost:$REGISTRY_PORT/myrepo&tag=mytag" 201
t POST "libpod/images/$iid/untag?repo=localhost:$REGISTRY_PORT/myrepo&tag=quiet-false" 201
# Try to push non-existing image # Try to push non-existing image
t POST "images/localhost:$REGISTRY_PORT/idonotexist/push?tlsVerify=false" 404 t POST "images/localhost:$REGISTRY_PORT/idonotexist/push?tlsVerify=false" 404