Merge pull request #3640 from bacongobbler/1156-expose-only-one-port-or-none

chore(controller): remove $PORT logic from fleet

Author: Matthew Fisher

controller/scheduler/fleet.py

@@ -379,7 +379,7 @@ def attach(self, name):
     {"section": "Unit", "name": "Description", "value": "{name}"},
     {"section": "Service", "name": "ExecStartPre", "value": '''/bin/sh -c "IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; docker pull $IMAGE"'''},  # noqa
     {"section": "Service", "name": "ExecStartPre", "value": '''/bin/sh -c "docker inspect {name} >/dev/null 2>&1 && docker rm -f {name} || true"'''},  # noqa
-    {"section": "Service", "name": "ExecStart", "value": '''/bin/sh -c "IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; port=$(docker inspect -f '{{{{range $k, $v := .ContainerConfig.ExposedPorts }}}}{{{{$k}}}}{{{{end}}}}' $IMAGE | cut -d/ -f1) ; docker run --name {name} {memory} {cpu} {hostname} -P -e PORT=$port $IMAGE {command}"'''},  # noqa
+    {"section": "Service", "name": "ExecStart", "value": '''/bin/sh -c "IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; docker run --name {name} {memory} {cpu} {hostname} -P $IMAGE {command}"'''},  # noqa
     {"section": "Service", "name": "ExecStop", "value": '''/usr/bin/docker stop {name}'''},
     {"section": "Service", "name": "ExecStop", "value": '''/usr/bin/docker rm -f {name}'''},
     {"section": "Service", "name": "TimeoutStartSec", "value": "20m"},

docs/using_deis/using-docker-images.rst

@@ -31,7 +31,7 @@ Docker Image Requirements
 In order to deploy Docker images, they must conform to the following requirements:
 
  * The Docker image must EXPOSE only one port
- * The exposed port must be an HTTP service that can be connected to an HTTP router
+ * The port must be listening for a HTTP connection
  * A default CMD must be specified for running the container
 
 .. note::

docs/using_deis/using-dockerfiles.rst

@@ -22,7 +22,7 @@ Dockerfile Requirements
 In order to deploy Dockerfile applications, they must conform to the following requirements:
 
  * The Dockerfile must EXPOSE only one port
- * The exposed port must be an HTTP service that can be connected to an HTTP router
+ * The port must be listening for a HTTP connection
  * A default CMD must be specified for running the container
 
 .. note::

publisher/server/publisher.go

@@ -111,6 +111,8 @@ func (s *Server) publishContainer(container *docker.APIContainers, ttl time.Dura
 		keyPath := fmt.Sprintf("/deis/services/%s", appPath)
 		dirPath := fmt.Sprintf("/deis/services/%s", appName)
 		for _, p := range container.Ports {
+			// lowest port wins (docker sorts the ports)
+			// TODO (bacongobbler): support multiple exposed ports
 			port := strconv.Itoa(int(p.PublicPort))
 			hostAndPort := s.host + ":" + port
 			if s.IsPublishableApp(containerName) && s.IsPortOpen(hostAndPort) {
@@ -120,7 +122,6 @@ func (s *Server) publishContainer(container *docker.APIContainers, ttl time.Dura
 				safeMap.data[container.ID] = appPath
 				safeMap.Unlock()
 			}
-			// TODO: support multiple exposed ports
 			break
 		}
 	}