Skip to content

Commit aee2ec5

Browse files
author
anandkumarpatel
committed
Merge pull request #469 from CodeNow/fix-bump-docker-mock
bump docker-mock
2 parents 937b594 + 69ef600 commit aee2ec5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"Filibuster": "git://github.com/Runnable/Filibuster.git#v0.1.4",
8282
"console-trace": "git://github.com/numbcoder/console-trace.git",
8383
"docker-listener": "git+ssh://[email protected]:codenow/docker-listener#v0.1.1",
84-
"docker-mock": "git://github.com/Runnable/docker-mock.git#v0.5.4",
84+
"docker-mock": "^0.5.5",
8585
"faker": "^1.0.0",
8686
"form-data": "^0.1.4",
8787
"function-proxy": "^0.5.1",

test/fixtures/expects.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,11 @@ function toHipacheEntryKey (containerPort, instanceName, user) {
279279
}
280280
function toHipacheEntryVal (containerPort, container, instanceName) {
281281
if (container.toJSON) { container = container.toJSON(); }
282+
var exposedPort = containerPort.split('/')[0];
282283
var actualPort = container.ports[containerPort][0].HostPort;
283284
var parsedDockerHost = url.parse(container.dockerHost);
284285
var backendUrl = url.format({
285-
protocol: 'http:',
286+
protocol: (exposedPort === '443') ? 'https:' : 'http:',
286287
slashes: true,
287288
hostname: parsedDockerHost.hostname,
288289
port: actualPort
@@ -340,4 +341,4 @@ function sortKeys (o) {
340341
});
341342
return out;
342343
}
343-
}
344+
}

0 commit comments

Comments
 (0)