浏览代码

Merge pull request #8044 from brahmaroutu/container_copy_6107

Change the copy command Content-Type header to x-tar
Fred Lifton 10 年之前
父节点
当前提交
fd501d4b3a
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 0
      api/server/server.go
  2. 1 1
      docs/sources/reference/api/docker_remote_api_v1.15.md

+ 1 - 0
api/server/server.go

@@ -1014,6 +1014,7 @@ func postContainersCopy(eng *engine.Engine, version version.Version, w http.Resp
 
 
 	job := eng.Job("container_copy", vars["name"], copyData.Get("Resource"))
 	job := eng.Job("container_copy", vars["name"], copyData.Get("Resource"))
 	job.Stdout.Add(w)
 	job.Stdout.Add(w)
+	w.Header().Set("Content-Type", "application/x-tar")
 	if err := job.Run(); err != nil {
 	if err := job.Run(); err != nil {
 		log.Errorf("%s", err.Error())
 		log.Errorf("%s", err.Error())
 		if strings.Contains(err.Error(), "No such container") {
 		if strings.Contains(err.Error(), "No such container") {

+ 1 - 1
docs/sources/reference/api/docker_remote_api_v1.15.md

@@ -710,7 +710,7 @@ Copy files or folders of container `id`
 **Example response**:
 **Example response**:
 
 
         HTTP/1.1 200 OK
         HTTP/1.1 200 OK
-        Content-Type: application/octet-stream
+        Content-Type: application/x-tar
 
 
         {{ TAR STREAM }}
         {{ TAR STREAM }}