Merge pull request #220 from vieux/apiversion

add more fields to /version
This commit is contained in:
Victor Vieux 2015-01-06 11:47:54 -08:00
commit 12d4cf53f7
1 changed files with 14 additions and 6 deletions

View File

@ -17,6 +17,8 @@ import (
"github.com/samalba/dockerclient" "github.com/samalba/dockerclient"
) )
const APIVERSION = "1.16"
type context struct { type context struct {
cluster *cluster.Cluster cluster *cluster.Cluster
scheduler *scheduler.Scheduler scheduler *scheduler.Scheduler
@ -54,12 +56,18 @@ func getInfo(c *context, w http.ResponseWriter, r *http.Request) {
func getVersion(c *context, w http.ResponseWriter, r *http.Request) { func getVersion(c *context, w http.ResponseWriter, r *http.Request) {
version := struct { version := struct {
Version string Version string
ApiVersion string
GoVersion string GoVersion string
GitCommit string GitCommit string
Os string
Arch string
}{ }{
Version: "swarm/" + c.version, Version: "swarm/" + c.version,
ApiVersion: APIVERSION,
GoVersion: runtime.Version(), GoVersion: runtime.Version(),
GitCommit: "n/a", GitCommit: "n/a",
Os: runtime.GOOS,
Arch: runtime.GOARCH,
} }
json.NewEncoder(w).Encode(version) json.NewEncoder(w).Encode(version)