Merge pull request docker-archive#1196 from vieux/initial_volume_support

add support for docker volume ls & inspect

Author: chanwit

Godeps/Godeps.json

@@ -168,6 +168,16 @@ func getImagesJSON(c *context, w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(images)
 }
 
+// GET /volumes
+func getVolumes(c *context, w http.ResponseWriter, r *http.Request) {
+	volumes := struct {
+		Volumes []*cluster.Volume
+	}{c.cluster.Volumes()}
+
+	w.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(volumes)
+}
+
 // GET /containers/ps
 // GET /containers/json
 func getContainersJSON(c *context, w http.ResponseWriter, r *http.Request) {
@@ -555,6 +565,16 @@ func ping(c *context, w http.ResponseWriter, r *http.Request) {
 	w.Write([]byte{'O', 'K'})
 }
 
+// Proxy a request to the right node
+func proxyVolume(c *context, w http.ResponseWriter, r *http.Request) {
+	var name = mux.Vars(r)["volumename"]
+	if volume := c.cluster.Volume(name); volume != nil {
+		proxy(c.tlsConfig, volume.Engine.Addr, w, r)
+		return
+	}
+	httpError(w, fmt.Sprintf("No such volume: %s", name), http.StatusNotFound)
+}
+
 // Proxy a request to the right node
 func proxyContainer(c *context, w http.ResponseWriter, r *http.Request) {
 	name, container, err := getContainerFromVars(c, mux.Vars(r))

Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go

@@ -47,6 +47,8 @@ var routes = map[string]map[string]handler{
 		"/containers/{name:.*}/stats":     proxyContainer,
 		"/containers/{name:.*}/attach/ws": proxyHijack,
 		"/exec/{execid:.*}/json":          proxyContainer,
+		"/volumes":                        getVolumes,
+		"/volumes/{volumename:.*}":        proxyVolume,
 	},
 	"POST": {
 		"/auth":                         proxyRandom,

Godeps/_workspace/src/github.com/samalba/dockerclient/interface.go

@@ -31,6 +31,12 @@ type Cluster interface {
 	// cluster.Containers().Get(IDOrName)
 	Container(IDOrName string) *Container
 
+	// Return all volumes
+	Volumes() []*Volume
+
+	// Return one volume from the cluster
+	Volume(name string) *Volume
+
 	// Pull images
 	// `callback` can be called multiple time
 	//  `where` is where it is being pulled

Godeps/_workspace/src/github.com/samalba/dockerclient/mockclient/mock.go

@@ -57,6 +57,7 @@ type Engine struct {
 	stopCh          chan struct{}
 	containers      map[string]*Container
 	images          []*Image
+	volumes         []*Volume
 	client          dockerclient.Client
 	eventHandler    EventHandler
 	healthy         bool
@@ -103,6 +104,9 @@ func (e *Engine) ConnectWithClient(client dockerclient.Client) error {
 		return err
 	}
 
+	// Do not check error as older daemon don't support this call
+	e.RefreshVolumes()
+
 	// Start the update loop.
 	go e.refreshLoop()
 
@@ -198,6 +202,21 @@ func (e *Engine) RefreshImages() error {
 	return nil
 }
 
+// RefreshVolumes refreshes the list of volumes on the engine.
+func (e *Engine) RefreshVolumes() error {
+	volumes, err := e.client.ListVolumes()
+	if err != nil {
+		return err
+	}
+	e.Lock()
+	e.volumes = nil
+	for _, volume := range volumes {
+		e.volumes = append(e.volumes, &Volume{Volume: *volume, Engine: e})
+	}
+	e.Unlock()
+	return nil
+}
+
 // RefreshContainers will refresh the list and status of containers running on the engine. If `full` is
 // true, each container will be inspected.
 // FIXME: unexport this method after mesos scheduler stops using it directly
@@ -312,6 +331,8 @@ func (e *Engine) refreshLoop() {
 
 		err = e.RefreshContainers(false)
 		if err == nil {
+			// Do not check error as older daemon don't support this call
+			e.RefreshVolumes()
 			err = e.RefreshImages()
 		}
 
@@ -521,6 +542,18 @@ func (e *Engine) Images(all bool) []*Image {
 	return images
 }
 
+// Volumes returns all the volumes in the engine
+func (e *Engine) Volumes() []*Volume {
+	e.RLock()
+
+	volumes := make([]*Volume, 0, len(e.volumes))
+	for _, volume := range e.volumes {
+		volumes = append(volumes, volume)
+	}
+	e.RUnlock()
+	return volumes
+}
+
 // Image returns the image with IDOrName in the engine
 func (e *Engine) Image(IDOrName string) *Image {
 	e.RLock()
@@ -549,9 +582,11 @@ func (e *Engine) handler(ev *dockerclient.Event, _ chan error, args ...interface
 		// If the container state changes, we have to do an inspect in
 		// order to update container.Info and get the new NetworkSettings.
 		e.refreshContainer(ev.Id, true)
+		e.RefreshVolumes()
 	default:
 		// Otherwise, do a "soft" refresh of the container.
 		e.refreshContainer(ev.Id, false)
+		e.RefreshVolumes()
 	}
 
 	// If there is no event handler registered, abort right now.