Merge branch 'master' into 1091_mh-switch-to-herokuish

tests/apps/checks-root/CHECKS

@@ -0,0 +1,2 @@
+ATTEMPTS=2
+/

tests/apps/checks-root/index.js

@@ -0,0 +1,11 @@
+var express = require('express');
+var app = express();
+
+app.get('/', function(req, res) {
+  res.sendStatus(404);
+});
+
+var port = process.env.PORT || 5000;
+app.listen(port, function() {
+  console.log('Listening on port ' + port);
+});

tests/apps/checks-root/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "node-example",
+  "version": "0.0.1",
+  "dependencies": {
+    "express": "4.x"
+  },
+  "engines": {
+    "node": "0.12.x",
+    "npm": "2.x"
+  },
+  "scripts": {
+    "start": "node index.js"
+  }
+}

tests/apps/dockerfile/Dockerfile

@@ -2,7 +2,9 @@ FROM ubuntu:trusty
 ENV LC_ALL C
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_NONINTERACTIVE_SEEN true
-EXPOSE 3000
+EXPOSE 3001/udp
+EXPOSE  3000/tcp
+EXPOSE 3003
 
 RUN apt-get install -y software-properties-common && add-apt-repository ppa:chris-lea/node.js && apt-get update
 RUN apt-get install -y build-essential curl postgresql-client-9.3 nodejs git