docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into future

This commit is contained in:
Andrea Luzzardi 2014-12-03 01:27:04 -08:00
parent 6336a56f05 f5827052a4
commit e23ecfdf94
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,5 +1,7 @@
# swarm: docker clustering # swarm: docker clustering
![Docker Swarm Logo](logo.png?raw=true "Docker Swarm Logo")
## Example usage ## Example usage
```bash ```bash

3
api/api.go
View File

@ -84,6 +84,9 @@ func getContainersJSON(c *context, w http.ResponseWriter, r *http.Request) {
if !strings.Contains(tmp.Status, "Up") && !all { if !strings.Contains(tmp.Status, "Up") && !all {
continue continue
} }
if !container.Node().IsHealthy() {
tmp.Status = "Pending"
}
// TODO remove the Node ID in the name when we have a good solution // TODO remove the Node ID in the name when we have a good solution
tmp.Names = make([]string, len(container.Names)) tmp.Names = make([]string, len(container.Names))
for i, name := range container.Names { for i, name := range container.Names {

BIN
logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 MiB

2
scheduler/filter/port.go
View File

@ -33,7 +33,7 @@ func (p *PortFilter) Filter(config *dockerclient.ContainerConfig, nodes []*clust
func (p *PortFilter) portAlreadyInUse(node *cluster.Node, requested dockerclient.PortBinding) bool { func (p *PortFilter) portAlreadyInUse(node *cluster.Node, requested dockerclient.PortBinding) bool {
for _, c := range node.Containers() { for _, c := range node.Containers() {
for _, port := range c.Info.NetworkSettings.Ports { for _, port := range c.Info.HostConfig.PortBindings {
for _, binding := range port { for _, binding := range port {
if binding.HostPort == requested.HostPort { if binding.HostPort == requested.HostPort {
// Another container on the same host is binding on the same // Another container on the same host is binding on the same