From 94f15bdf93e56d301a2600760b9f9fe7918424f8 Mon Sep 17 00:00:00 2001
From: Bryan Kendall <bryan@runnable.com>
Date: Wed, 7 Jan 2015 15:23:20 -0800
Subject: [PATCH 1/2] bump docker-mock

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 24bdf0b34..7b3a60176 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "Filibuster": "git://github.com/Runnable/Filibuster.git#v0.1.4",
     "console-trace": "git://github.com/numbcoder/console-trace.git",
     "docker-listener": "git+ssh://git@github.com:codenow/docker-listener#v0.1.1",
-    "docker-mock": "git://github.com/Runnable/docker-mock.git#v0.5.4",
+    "docker-mock": "^0.5.5",
     "faker": "^1.0.0",
     "form-data": "^0.1.4",
     "function-proxy": "^0.5.1",

From 69ef6001c6923a61ef368858e37957113b402520 Mon Sep 17 00:00:00 2001
From: Bryan Kendall <bryan@runnable.com>
Date: Wed, 7 Jan 2015 15:56:41 -0800
Subject: [PATCH 2/2] fixing https expectation in test

---
 test/fixtures/expects.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/fixtures/expects.js b/test/fixtures/expects.js
index bbff65d0a..7f04e709a 100644
--- a/test/fixtures/expects.js
+++ b/test/fixtures/expects.js
@@ -279,10 +279,11 @@ function toHipacheEntryKey (containerPort, instanceName, user) {
 }
 function toHipacheEntryVal (containerPort, container, instanceName) {
   if (container.toJSON) { container = container.toJSON(); }
+  var exposedPort = containerPort.split('/')[0];
   var actualPort = container.ports[containerPort][0].HostPort;
   var parsedDockerHost = url.parse(container.dockerHost);
   var backendUrl = url.format({
-    protocol: 'http:',
+    protocol: (exposedPort === '443') ? 'https:' : 'http:',
     slashes: true,
     hostname: parsedDockerHost.hostname,
     port: actualPort
@@ -340,4 +341,4 @@ function sortKeys (o) {
     });
     return out;
   }
-}
\ No newline at end of file
+}