core: ports by enviroment

Author: mcuadros

core/docker.go

@@ -19,6 +19,7 @@ import (
 
 type Docker struct {
 	endPoint string
+	env      *Environment
 	client   *docker.Client
 }
 
@@ -42,7 +43,7 @@ func NewDocker(endPoint string, env *Environment) (*Docker, error) {
 		return nil, err
 	}
 
-	return &Docker{client: c, endPoint: endPoint}, nil
+	return &Docker{client: c, endPoint: endPoint, env: env}, nil
 }
 
 func (d *Docker) Deploy(p *Project, rev Revision, dockerfile *Dockerfile, output io.Writer, force bool) error {
@@ -345,18 +346,23 @@ func (d *Docker) formatPorts(ports []string) (map[docker.Port][]docker.PortBindi
 
 // <host_interface>:<host_port>:<container_port>/<proto>
 func (d *Docker) formatPort(port string) (guest docker.Port, host docker.PortBinding, err error) {
-	p1 := strings.SplitN(port, "/", 2)
-	p2 := strings.SplitN(p1[0], ":", 3)
+	p1 := strings.SplitN(port, "@", 2)
+	if len(p1) == 2 && d.env != nil && d.env.Name != p1[1] {
+		return
+	}
+
+	p2 := strings.SplitN(p1[0], "/", 2)
+	p3 := strings.SplitN(p2[0], ":", 3)
 
-	if len(p1) != 2 || len(p2) != 3 {
+	if len(p2) != 2 || len(p3) != 3 {
 		err = errors.New(fmt.Sprintf("Malformed port %q", port))
 		return
 	}
 
-	guest = docker.Port(fmt.Sprintf("%s/%s", p2[2], p1[1]))
+	guest = docker.Port(fmt.Sprintf("%s/%s", p3[2], p2[1]))
 	host = docker.PortBinding{
-		HostIP:   p2[0],
-		HostPort: p2[1],
+		HostIP:   p3[0],
+		HostPort: p3[1],
 	}
 
 	return

core/docker_test.go

@@ -233,15 +233,18 @@ func (s *CoreSuite) TestDocker_formatPorts(c *C) {
 		"0.0.0.0:8080:80/tcp",
 		"0.0.0.0:8080:80/udp",
 		"0.0.0.0:42:42/tcp",
-		"1.1.1.1:42:80/tcp",
+		"1.1.1.1:42:80/tcp@bar",
+		"2.2.2.2:42:80/tcp@foo",
 	}
 
-	d, _ := NewDocker("", nil)
+	d, _ := NewDocker("tcp://foo", &Environment{Name: "foo"})
 	r, _ := d.formatPorts(p)
-	c.Assert(r, HasLen, 3)
+	c.Assert(r, HasLen, 4)
 	c.Assert(r["80/tcp"], HasLen, 2)
 	c.Assert(r["80/tcp"][0].HostIP, Equals, "0.0.0.0")
 	c.Assert(r["80/tcp"][0].HostPort, Equals, "8080")
+	c.Assert(r["80/tcp"][1].HostIP, Equals, "2.2.2.2")
+	c.Assert(r["80/tcp"][1].HostPort, Equals, "42")
 	c.Assert(r["80/udp"], HasLen, 1)
 	c.Assert(r["42/tcp"], HasLen, 1)
 }

documentation/configuration.md

@@ -69,7 +69,7 @@ An environment is a logical group of any number of Docker servers. Dockership su
 * `RelatedRepositories` (optional, multiple): SSH clone URL to dependent repositories. (Link to more explanatory document)
 * `History` (default: 3): Number to old images you want to keep in each Docker server. 
 * `NoCache` (optional): Avoid to use the Docker cache (like --no-cache at `docker build`)
-* `Port` (multiple, optional): container port to expose, format: `<host-addr>:<host-port>:<container-port>/<proto>` (like -p at `docker run`)
+* `Port` (multiple, optional): container port to expose, format: `<host-addr>:<host-port>:<container-port>/<proto>` (like -p at `docker run`), additionaly the port can be configured just for one enviroment adding it to end of the port preceded by a `@` (eg: `2.2.2.2:80:80/tcp@live`)
 * `Restart` (optional, default: no): restart policy to apply when a container exits (no, on-failure[:max-retry], always)  (like --restart at `docker run`)
 * `Link` (multiple, optional): creates a Link to other project, when this project is deployed the linked projects are restarted (like -P at `docker run`)
 * `GithubToken` (default: Global.GithubToken): the token needed to access this repository, if it is different from the global one.