Remove builtins

Signed-off-by: Antonio Murdaca <me@runcom.ninja>

api/server/server.go

@@ -3,6 +3,7 @@ package server
 import (
 	"bufio"
 	"bytes"
+	"runtime"
 	"time"
 
 	"encoding/base64"
@@ -21,6 +22,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api"
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/autogen/dockerversion"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/daemon/networkdriver/bridge"
 	"github.com/docker/docker/engine"
@@ -28,6 +30,7 @@ import (
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/pkg/parsers"
 	"github.com/docker/docker/pkg/parsers/filters"
+	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/docker/docker/pkg/streamformatter"
@@ -41,6 +44,19 @@ var (
 	activationLock = make(chan struct{})
 )
 
+type ServerConfig struct {
+	Logging     bool
+	EnableCors  bool
+	CorsHeaders string
+	Version     string
+	SocketGroup string
+	Tls         bool
+	TlsVerify   bool
+	TlsCa       string
+	TlsCert     string
+	TlsKey      string
+}
+
 type HttpServer struct {
 	srv *http.Server
 	l   net.Listener
@@ -187,8 +203,20 @@ func postAuth(eng *engine.Engine, version version.Version, w http.ResponseWriter
 
 func getVersion(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
 	w.Header().Set("Content-Type", "application/json")
-	eng.ServeHTTP(w, r)
-	return nil
+
+	v := &types.Version{
+		Version:    dockerversion.VERSION,
+		ApiVersion: api.APIVERSION,
+		GitCommit:  dockerversion.GITCOMMIT,
+		GoVersion:  runtime.Version(),
+		Os:         runtime.GOOS,
+		Arch:       runtime.GOARCH,
+	}
+	if kernelVersion, err := kernel.GetKernelVersion(); err == nil {
+		v.KernelVersion = kernelVersion.String()
+	}
+
+	return writeJSON(w, http.StatusOK, v)
 }
 
 func postContainersKill(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
@@ -1588,28 +1616,22 @@ type Server interface {
 
 // ServeApi loops through all of the protocols sent in to docker and spawns
 // off a go routine to setup a serving http.Server for each.
-func ServeApi(job *engine.Job) error {
-	if len(job.Args) == 0 {
-		return fmt.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name)
-	}
-	var (
-		protoAddrs = job.Args
-		chErrors   = make(chan error, len(protoAddrs))
-	)
+func ServeApi(protoAddrs []string, conf *ServerConfig, eng *engine.Engine) error {
+	var chErrors = make(chan error, len(protoAddrs))
 
 	for _, protoAddr := range protoAddrs {
 		protoAddrParts := strings.SplitN(protoAddr, "://", 2)
 		if len(protoAddrParts) != 2 {
-			return fmt.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name)
+			return fmt.Errorf("bad format, expected PROTO://ADDR")
 		}
 		go func() {
 			logrus.Infof("Listening for HTTP on %s (%s)", protoAddrParts[0], protoAddrParts[1])
-			srv, err := NewServer(protoAddrParts[0], protoAddrParts[1], job)
+			srv, err := NewServer(protoAddrParts[0], protoAddrParts[1], conf, eng)
 			if err != nil {
 				chErrors <- err
 				return
 			}
-			job.Eng.OnShutdown(func() {
+			eng.OnShutdown(func() {
 				if err := srv.Close(); err != nil {
 					logrus.Error(err)
 				}

api/server/server_linux.go

@@ -13,16 +13,16 @@ import (
 )
 
 // NewServer sets up the required Server and does protocol specific checking.
-func NewServer(proto, addr string, job *engine.Job) (Server, error) {
+func NewServer(proto, addr string, conf *ServerConfig, eng *engine.Engine) (Server, error) {
 	var (
 		err error
 		l   net.Listener
 		r   = createRouter(
-			job.Eng,
-			job.GetenvBool("Logging"),
-			job.GetenvBool("EnableCors"),
-			job.Getenv("CorsHeaders"),
-			job.Getenv("Version"),
+			eng,
+			conf.Logging,
+			conf.EnableCors,
+			conf.CorsHeaders,
+			conf.Version,
 		)
 	)
 	switch proto {
@@ -52,17 +52,17 @@ func NewServer(proto, addr string, job *engine.Job) (Server, error) {
 		}
 		return nil, nil
 	case "tcp":
-		if !job.GetenvBool("TlsVerify") {
+		if !conf.TlsVerify {
 			logrus.Warn("/!\\ DON'T BIND ON ANY IP ADDRESS WITHOUT setting -tlsverify IF YOU DON'T KNOW WHAT YOU'RE DOING /!\\")
 		}
-		if l, err = NewTcpSocket(addr, tlsConfigFromJob(job)); err != nil {
+		if l, err = NewTcpSocket(addr, tlsConfigFromServerConfig(conf)); err != nil {
 			return nil, err
 		}
 		if err := allocateDaemonPort(addr); err != nil {
 			return nil, err
 		}
 	case "unix":
-		if l, err = NewUnixSocket(addr, job.Getenv("SocketGroup")); err != nil {
+		if l, err = NewUnixSocket(addr, conf.SocketGroup); err != nil {
 			return nil, err
 		}
 	default:
@@ -77,8 +77,7 @@ func NewServer(proto, addr string, job *engine.Job) (Server, error) {
 	}, nil
 }
 
-// Called through eng.Job("acceptconnections")
-func AcceptConnections(job *engine.Job) error {
+func AcceptConnections() {
 	// Tell the init daemon we are accepting requests
 	go systemd.SdNotify("READY=1")
 	// close the lock so the listeners start accepting connections
@@ -87,5 +86,4 @@ func AcceptConnections(job *engine.Job) error {
 	default:
 		close(activationLock)
 	}
-	return nil
 }

api/server/server_unit_test.go

@@ -34,35 +34,6 @@ func TesthttpError(t *testing.T) {
 	}
 }
 
-func TestGetVersion(t *testing.T) {
-	eng := engine.New()
-	var called bool
-	eng.Register("version", func(job *engine.Job) error {
-		called = true
-		v := &engine.Env{}
-		v.SetJson("Version", "42.1")
-		v.Set("ApiVersion", "1.1.1.1.1")
-		v.Set("GoVersion", "2.42")
-		v.Set("Os", "Linux")
-		v.Set("Arch", "x86_64")
-		if _, err := v.WriteTo(job.Stdout); err != nil {
-			return err
-		}
-		return nil
-	})
-	r := serveRequest("GET", "/version", nil, eng, t)
-	if !called {
-		t.Fatalf("handler was not called")
-	}
-	v := readEnv(r.Body, t)
-	if v.Get("Version") != "42.1" {
-		t.Fatalf("%#v\n", v)
-	}
-	if r.HeaderMap.Get("Content-Type") != "application/json" {
-		t.Fatalf("%#v\n", r)
-	}
-}
-
 func TestGetInfo(t *testing.T) {
 	eng := engine.New()
 	var called bool

api/server/server_windows.go

@@ -39,13 +39,11 @@ func NewServer(proto, addr string, job *engine.Job) (Server, error) {
 	}
 }
 
-// Called through eng.Job("acceptconnections")
-func AcceptConnections(job *engine.Job) error {
+func AcceptConnections() {
 	// close the lock so the listeners start accepting connections
 	select {
 	case <-activationLock:
 	default:
 		close(activationLock)
 	}
-	return nil
 }

api/server/tcp_socket.go

@@ -8,7 +8,6 @@ import (
 	"net"
 	"os"
 
-	"github.com/docker/docker/engine"
 	"github.com/docker/docker/pkg/listenbuffer"
 )
 
@@ -19,16 +18,16 @@ type tlsConfig struct {
 	Verify      bool
 }
 
-func tlsConfigFromJob(job *engine.Job) *tlsConfig {
-	verify := job.GetenvBool("TlsVerify")
-	if !job.GetenvBool("Tls") && !verify {
+func tlsConfigFromServerConfig(conf *ServerConfig) *tlsConfig {
+	verify := conf.TlsVerify
+	if !conf.Tls && !conf.TlsVerify {
 		return nil
 	}
 	return &tlsConfig{
 		Verify:      verify,
-		Certificate: job.Getenv("TlsCert"),
-		Key:         job.Getenv("TlsKey"),
-		CA:          job.Getenv("TlsCa"),
+		Certificate: conf.TlsCert,
+		Key:         conf.TlsKey,
+		CA:          conf.TlsCa,
 	}
 }
 

api/types/types.go

@@ -1,5 +1,7 @@
 package types
 
+import "github.com/docker/docker/pkg/version"
+
 // ContainerCreateResponse contains the information returned to a client on the
 // creation of a new container.
 type ContainerCreateResponse struct {
@@ -110,3 +112,13 @@ type ContainerProcessList struct {
 	Processes [][]string
 	Titles    []string
 }
+
+type Version struct {
+	Version       string
+	ApiVersion    version.Version
+	GitCommit     string
+	GoVersion     string
+	Os            string
+	Arch          string
+	KernelVersion string `json:",omitempty"`
+}