Move "copy" to daemon/copy.go

This is part of an effort to break apart the deprecated server/ package

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)

daemon/copy.go

@@ -0,0 +1,33 @@
+package daemon
+
+import (
+	"io"
+
+	"github.com/docker/docker/engine"
+)
+
+func (daemon *Daemon) ContainerCopy(job *engine.Job) engine.Status {
+	if len(job.Args) != 2 {
+		return job.Errorf("Usage: %s CONTAINER RESOURCE\n", job.Name)
+	}
+
+	var (
+		name     = job.Args[0]
+		resource = job.Args[1]
+	)
+
+	if container := daemon.Get(name); container != nil {
+
+		data, err := container.Copy(resource)
+		if err != nil {
+			return job.Error(err)
+		}
+		defer data.Close()
+
+		if _, err := io.Copy(job.Stdout, data); err != nil {
+			return job.Error(err)
+		}
+		return engine.StatusOK
+	}
+	return job.Errorf("No such container: %s", name)
+}

daemon/daemon.go

@@ -152,6 +152,9 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
 	if err := eng.Register("delete", daemon.ContainerDestroy); err != nil {
 		return err
 	}
+	if err := eng.Register("container_copy", daemon.ContainerCopy); err != nil {
+		return err
+	}
 	return nil
 }
 

server/container.go

@@ -7,7 +7,6 @@ package server
 import (
 	"errors"
 	"fmt"
-	"io"
 	"os/exec"
 	"strconv"
 	"strings"
@@ -218,29 +217,3 @@ func (srv *Server) Containers(job *engine.Job) engine.Status {
 	}
 	return engine.StatusOK
 }
-
-func (srv *Server) ContainerCopy(job *engine.Job) engine.Status {
-	if len(job.Args) != 2 {
-		return job.Errorf("Usage: %s CONTAINER RESOURCE\n", job.Name)
-	}
-
-	var (
-		name     = job.Args[0]
-		resource = job.Args[1]
-	)
-
-	if container := srv.daemon.Get(name); container != nil {
-
-		data, err := container.Copy(resource)
-		if err != nil {
-			return job.Error(err)
-		}
-		defer data.Close()
-
-		if _, err := io.Copy(job.Stdout, data); err != nil {
-			return job.Error(err)
-		}
-		return engine.StatusOK
-	}
-	return job.Errorf("No such container: %s", name)
-}

server/init.go

@@ -86,24 +86,23 @@ func InitServer(job *engine.Job) engine.Status {
 	job.Eng.Hack_SetGlobalVar("httpapi.daemon", srv.daemon)
 
 	for name, handler := range map[string]engine.Handler{
-		"tag":            srv.ImageTag, // FIXME merge with "image_tag"
-		"info":           srv.DockerInfo,
-		"image_export":   srv.ImageExport,
-		"images":         srv.Images,
-		"history":        srv.ImageHistory,
-		"viz":            srv.ImagesViz,
-		"container_copy": srv.ContainerCopy,
-		"log":            srv.Log,
-		"changes":        srv.ContainerChanges,
-		"top":            srv.ContainerTop,
-		"load":           srv.ImageLoad,
-		"build":          srv.Build,
-		"pull":           srv.ImagePull,
-		"import":         srv.ImageImport,
-		"image_delete":   srv.ImageDelete,
-		"events":         srv.Events,
-		"push":           srv.ImagePush,
-		"containers":     srv.Containers,
+		"tag":          srv.ImageTag, // FIXME merge with "image_tag"
+		"info":         srv.DockerInfo,
+		"image_export": srv.ImageExport,
+		"images":       srv.Images,
+		"history":      srv.ImageHistory,
+		"viz":          srv.ImagesViz,
+		"log":          srv.Log,
+		"changes":      srv.ContainerChanges,
+		"top":          srv.ContainerTop,
+		"load":         srv.ImageLoad,
+		"build":        srv.Build,
+		"pull":         srv.ImagePull,
+		"import":       srv.ImageImport,
+		"image_delete": srv.ImageDelete,
+		"events":       srv.Events,
+		"push":         srv.ImagePush,
+		"containers":   srv.Containers,
 	} {
 		if err := job.Eng.Register(name, srv.handlerWrap(handler)); err != nil {
 			return job.Error(err)