opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 12:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9270 from matejvasek/fix_apiv2_push

Browse Source 
Fix Docker APIv2 push endpoint
This commit is contained in:
OpenShift Merge Robot
2021-02-09 14:30:12 -05:00
committed by GitHub
parent 995a60481a 721a1e104e
commit a8c7aedc74
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/api/handlers/compat/images_push.go
View File

@ -1,7 +1,6 @@
package compat package compat
import ( import (
"context"
"net/http" "net/http"
"strings" "strings"
@ -76,7 +75,15 @@ func PushImage(w http.ResponseWriter, r *http.Request) {
if _, found := r.URL.Query()["tlsVerify"]; found { if _, found := r.URL.Query()["tlsVerify"]; found {
options.SkipTLSVerify = types.NewOptionalBool(!query.TLSVerify) options.SkipTLSVerify = types.NewOptionalBool(!query.TLSVerify)
} }
if err := imageEngine.Push(context.Background(), imageName, query.Destination, options); err != nil {
var destination string
if _, found := r.URL.Query()["destination"]; found {
destination = query.Destination
} else {
destination = imageName
}
if err := imageEngine.Push(r.Context(), imageName, destination, options); err != nil {
if errors.Cause(err) != storage.ErrImageUnknown { if errors.Cause(err) != storage.ErrImageUnknown {
utils.ImageNotFound(w, imageName, errors.Wrapf(err, "failed to find image %s", imageName)) utils.ImageNotFound(w, imageName, errors.Wrapf(err, "failed to find image %s", imageName))
return return

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

@ -24,13 +24,10 @@ t GET libpod/images/$IMAGE/json 200 \
# Run registry container # Run registry container
podman run -d --name registry -p 5000:5000 quay.io/libpod/registry:2.6 /entrypoint.sh /etc/docker/registry/config.yml podman run -d --name registry -p 5000:5000 quay.io/libpod/registry:2.6 /entrypoint.sh /etc/docker/registry/config.yml
sleep 2
# Push to local registry # Push to local registry
# FIXME: this is failing: t POST "images/localhost:5000/myrepo/push?tlsVerify=false&tag=mytag" '' 200
# "cause": "received unexpected HTTP status: 500 Internal Server Error",
# "message": "error pushing image \"localhost:5000/myrepo:mytag\": error copying image to the remote destination: Error writing blob: Error initiating layer upload to /v2/myrepo/blobs/uploads/ in localhost:5000: received unexpected HTTP status: 500 Internal Server Error",
# "response": 400
#t POST libpod/images/localhost:5000/myrepo:mytag/push\?tlsVerify\=false '' 200
# Untag the image # Untag the image
t POST "libpod/images/$iid/untag?repo=localhost:5000/myrepo&tag=mytag" '' 201 t POST "libpod/images/$iid/untag?repo=localhost:5000/myrepo&tag=mytag" '' 201