forked from containers/podman
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor remote pull to provide progress
podman and podman-remote do not exactly match as the lower layer code checks if the output is destined for a TTY before creating the progress bars. A future PR for containers/images could change this behavior. Fixes containers#7543 Tested with: $ (echo '# start'; podman-remote pull nginx ) 2>&1 | ts '[%Y-%m-%d %H:%M:%.S]' $ (echo '# start'; podman pull nginx ) 2>&1 | ts '[%Y-%m-%d %H:%M:%.S]' Signed-off-by: Jhon Honce <[email protected]>
- Loading branch information
Showing
6 changed files
with
307 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| package libpod | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "net/http" | ||
| "strings" | ||
|
|
||
| "github.com/containers/image/v5/docker" | ||
| "github.com/containers/image/v5/docker/reference" | ||
| "github.com/containers/image/v5/types" | ||
| "github.com/containers/podman/v2/libpod" | ||
| "github.com/containers/podman/v2/libpod/image" | ||
| "github.com/containers/podman/v2/pkg/api/handlers/utils" | ||
| "github.com/containers/podman/v2/pkg/auth" | ||
| "github.com/containers/podman/v2/pkg/channel" | ||
| "github.com/containers/podman/v2/pkg/domain/entities" | ||
| "github.com/containers/podman/v2/pkg/util" | ||
| "github.com/gorilla/schema" | ||
| "github.com/pkg/errors" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| // ImagesPull is the v2 libpod endpoint for pulling images. Note that the | ||
| // mandatory `reference` must be a reference to a registry (i.e., of docker | ||
| // transport or be normalized to one). Other transports are rejected as they | ||
| // do not make sense in a remote context. | ||
| func ImagesPull(w http.ResponseWriter, r *http.Request) { | ||
| runtime := r.Context().Value("runtime").(*libpod.Runtime) | ||
| decoder := r.Context().Value("decoder").(*schema.Decoder) | ||
| query := struct { | ||
| Reference string `schema:"reference"` | ||
| OverrideOS string `schema:"overrideOS"` | ||
| OverrideArch string `schema:"overrideArch"` | ||
| OverrideVariant string `schema:"overrideVariant"` | ||
| TLSVerify bool `schema:"tlsVerify"` | ||
| AllTags bool `schema:"allTags"` | ||
| }{ | ||
| TLSVerify: true, | ||
| } | ||
|
|
||
| if err := decoder.Decode(&query, r.URL.Query()); err != nil { | ||
| utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, | ||
| errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String())) | ||
| return | ||
| } | ||
|
|
||
| if len(query.Reference) == 0 { | ||
| utils.InternalServerError(w, errors.New("reference parameter cannot be empty")) | ||
| return | ||
| } | ||
|
|
||
| imageRef, err := utils.ParseDockerReference(query.Reference) | ||
| if err != nil { | ||
| utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, | ||
| errors.Wrapf(err, "image destination %q is not a docker-transport reference", query.Reference)) | ||
| return | ||
| } | ||
|
|
||
| // Trim the docker-transport prefix. | ||
| rawImage := strings.TrimPrefix(query.Reference, fmt.Sprintf("%s://", docker.Transport.Name())) | ||
|
|
||
| // all-tags doesn't work with a tagged reference, so let's check early | ||
| namedRef, err := reference.Parse(rawImage) | ||
| if err != nil { | ||
| utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, | ||
| errors.Wrapf(err, "error parsing reference %q", rawImage)) | ||
| return | ||
| } | ||
| if _, isTagged := namedRef.(reference.Tagged); isTagged && query.AllTags { | ||
| utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, | ||
| errors.Errorf("reference %q must not have a tag for all-tags", rawImage)) | ||
| return | ||
| } | ||
|
|
||
| authConf, authfile, err := auth.GetCredentials(r) | ||
| if err != nil { | ||
| utils.Error(w, "Something went wrong.", http.StatusBadRequest, errors.Wrapf(err, "Failed to parse %q header for %s", auth.XRegistryAuthHeader, r.URL.String())) | ||
| return | ||
| } | ||
| defer auth.RemoveAuthfile(authfile) | ||
|
|
||
| // Setup the registry options | ||
| dockerRegistryOptions := image.DockerRegistryOptions{ | ||
| DockerRegistryCreds: authConf, | ||
| OSChoice: query.OverrideOS, | ||
| ArchitectureChoice: query.OverrideArch, | ||
| VariantChoice: query.OverrideVariant, | ||
| } | ||
| if _, found := r.URL.Query()["tlsVerify"]; found { | ||
| dockerRegistryOptions.DockerInsecureSkipTLSVerify = types.NewOptionalBool(!query.TLSVerify) | ||
| } | ||
|
|
||
| sys := runtime.SystemContext() | ||
| if sys == nil { | ||
| sys = image.GetSystemContext("", authfile, false) | ||
| } | ||
| dockerRegistryOptions.DockerCertPath = sys.DockerCertPath | ||
| sys.DockerAuthConfig = authConf | ||
|
|
||
| // Prepare the images we want to pull | ||
| imagesToPull := []string{} | ||
| imageName := namedRef.String() | ||
|
|
||
| if !query.AllTags { | ||
| imagesToPull = append(imagesToPull, imageName) | ||
| } else { | ||
| tags, err := docker.GetRepositoryTags(context.Background(), sys, imageRef) | ||
| if err != nil { | ||
| utils.InternalServerError(w, errors.Wrap(err, "error getting repository tags")) | ||
| return | ||
| } | ||
| for _, tag := range tags { | ||
| imagesToPull = append(imagesToPull, fmt.Sprintf("%s:%s", imageName, tag)) | ||
| } | ||
| } | ||
|
|
||
| writer := channel.NewWriter(make(chan []byte, 1)) | ||
| defer writer.Close() | ||
|
|
||
| stderr := channel.NewWriter(make(chan []byte, 1)) | ||
| defer stderr.Close() | ||
|
|
||
| images := make([]string, 0, len(imagesToPull)) | ||
| runCtx, cancel := context.WithCancel(context.Background()) | ||
| go func(imgs []string) { | ||
| defer cancel() | ||
| // Finally pull the images | ||
| for _, img := range imgs { | ||
| newImage, err := runtime.ImageRuntime().New( | ||
| runCtx, | ||
| img, | ||
| "", | ||
| authfile, | ||
| writer, | ||
| &dockerRegistryOptions, | ||
| image.SigningOptions{}, | ||
| nil, | ||
| util.PullImageAlways) | ||
| if err != nil { | ||
| stderr.Write([]byte(err.Error() + "\n")) | ||
| } else { | ||
| images = append(images, newImage.ID()) | ||
| } | ||
| } | ||
| }(imagesToPull) | ||
|
|
||
| flush := func() { | ||
| if flusher, ok := w.(http.Flusher); ok { | ||
| flusher.Flush() | ||
| } | ||
| } | ||
|
|
||
| w.WriteHeader(http.StatusOK) | ||
| w.Header().Add("Content-Type", "application/json") | ||
| flush() | ||
|
|
||
| enc := json.NewEncoder(w) | ||
| enc.SetEscapeHTML(true) | ||
| var failed bool | ||
| loop: // break out of for/select infinite loop | ||
| for { | ||
| var report entities.ImagePullReport | ||
| select { | ||
| case e := <-writer.Chan(): | ||
| report.Stream = string(e) | ||
| if err := enc.Encode(report); err != nil { | ||
| stderr.Write([]byte(err.Error())) | ||
| } | ||
| flush() | ||
| case e := <-stderr.Chan(): | ||
| failed = true | ||
| report.Error = string(e) | ||
| if err := enc.Encode(report); err != nil { | ||
| logrus.Warnf("Failed to json encode error %q", err.Error()) | ||
| } | ||
| flush() | ||
| case <-runCtx.Done(): | ||
| if !failed { | ||
| report.Images = images | ||
| if err := enc.Encode(report); err != nil { | ||
| logrus.Warnf("Failed to json encode error %q", err.Error()) | ||
| } | ||
| flush() | ||
| } | ||
| break loop // break out of for/select infinite loop | ||
| case <-r.Context().Done(): | ||
| // Client has closed connection | ||
| break loop // break out of for/select infinite loop | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.