summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-02 14:52:38 -0400
committerGitHub <noreply@github.com>2020-10-02 14:52:38 -0400
commitd4e97b35c2fa9e27b78c14e9ce7f3272d7db7cbf (patch)
treed7be7239f186a6c9f3c5f026f5c306166ce5ae11 /pkg
parentf1cdead33d8f9c29348f9a66ba4a6aa5ed0aa7b2 (diff)
parent6a291942c253fcb13fc2ee0990f2137ca3584270 (diff)
downloadpodman-d4e97b35c2fa9e27b78c14e9ce7f3272d7db7cbf.tar.gz
podman-d4e97b35c2fa9e27b78c14e9ce7f3272d7db7cbf.tar.bz2
podman-d4e97b35c2fa9e27b78c14e9ce7f3272d7db7cbf.zip
Merge pull request #7901 from vrothberg/fix-compat-images-create
compat: images/create: fix tag parsing
Diffstat (limited to 'pkg')
-rw-r--r--pkg/api/handlers/compat/images.go21
1 files changed, 17 insertions, 4 deletions
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
index 940b57343..cc67ebcd1 100644
--- a/pkg/api/handlers/compat/images.go
+++ b/pkg/api/handlers/compat/images.go
@@ -20,9 +20,25 @@ import (
"github.com/containers/podman/v2/pkg/domain/entities"
"github.com/docker/docker/api/types"
"github.com/gorilla/schema"
+ "github.com/opencontainers/go-digest"
"github.com/pkg/errors"
)
+// mergeNameAndTagOrDigest creates an image reference as string from the
+// provided image name and tagOrDigest which can be a tag, a digest or empty.
+func mergeNameAndTagOrDigest(name, tagOrDigest string) string {
+ if len(tagOrDigest) == 0 {
+ return name
+ }
+
+ separator := ":" // default to tag
+ if _, err := digest.Parse(tagOrDigest); err == nil {
+ // We have a digest, so let's change the separator.
+ separator = "@"
+ }
+ return fmt.Sprintf("%s%s%s", name, separator, tagOrDigest)
+}
+
func ExportImage(w http.ResponseWriter, r *http.Request) {
// 200 ok
// 500 server
@@ -252,10 +268,7 @@ func CreateImageFromImage(w http.ResponseWriter, r *http.Request) {
return
}
- fromImage := query.FromImage
- if len(query.Tag) >= 1 {
- fromImage = fmt.Sprintf("%s:%s", fromImage, query.Tag)
- }
+ fromImage := mergeNameAndTagOrDigest(query.FromImage, query.Tag)
authConf, authfile, key, err := auth.GetCredentials(r)
if err != nil {