opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 09:36:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7205 from baude/issue7185

Browse Source 
docker-compose uses application/tar
This commit is contained in:
OpenShift Merge Robot
2020-08-04 12:20:25 +02:00
committed by GitHub
parent 861702e026 246603041c
commit f7440ffaf6
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/api/handlers/compat/images_build.go
View File

@ -20,6 +20,7 @@ import (
"github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/containers/podman/v2/pkg/api/handlers/utils"
"github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/archive"
"github.com/gorilla/schema" "github.com/gorilla/schema"
"github.com/sirupsen/logrus"
) )
func BuildImage(w http.ResponseWriter, r *http.Request) { func BuildImage(w http.ResponseWriter, r *http.Request) {
@ -33,7 +34,13 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
} }
if hdr, found := r.Header["Content-Type"]; found && len(hdr) > 0 { if hdr, found := r.Header["Content-Type"]; found && len(hdr) > 0 {
if hdr[0] != "application/x-tar" { contentType := hdr[0]
switch contentType {
case "application/tar":
logrus.Warnf("tar file content type is %s, should use \"application/x-tar\" content type", contentType)
case "application/x-tar":
break
default:
utils.BadRequest(w, "Content-Type", hdr[0], utils.BadRequest(w, "Content-Type", hdr[0],
fmt.Errorf("Content-Type: %s is not supported. Should be \"application/x-tar\"", hdr[0])) fmt.Errorf("Content-Type: %s is not supported. Should be \"application/x-tar\"", hdr[0]))
return return